diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 2 | ||||
| -rw-r--r-- | target/linux/kernel.config | 3 | ||||
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 12 | ||||
| -rw-r--r-- | target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 12 | ||||
| -rw-r--r-- | target/sh/Makefile | 6 | ||||
| -rw-r--r-- | target/sh/sys-available/qemu-sh4 | 1 | ||||
| -rw-r--r-- | target/sh/sys-available/qemu-sh4eb | 1 |
7 files changed, 10 insertions, 27 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 68e2eefb0..e22880b1e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -49,6 +49,7 @@ config ADK_TARGET_FLOAT default "soft" if ADK_soft_float config ADK_TARGET_ARM_MODE + depends on ADK_LINUX_ARM string default "arm" if ADK_mode_arm default "thumb" if ADK_mode_thumb @@ -695,6 +696,7 @@ config ADK_TARGET_LIB_MUSL ADK_LINUX_MICROBLAZE || \ ADK_LINUX_MIPS || \ ADK_LINUX_PPC || \ + ADK_LINUX_SH || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 help diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 97237b382..26205a842 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -2,6 +2,7 @@ CONFIG_DEFAULT_HOSTNAME="openadk" CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="" CONFIG_MMU=y +CONFIG_NO_HZ=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y @@ -26,9 +27,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y -CONFIG_NO_HZ=y CONFIG_PRINTK=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_BUG=n CONFIG_FUTEX=y CONFIG_EPOLL=y diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 7ae56f8c5..3c331795d 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -1,3 +1,4 @@ +CONFIG_MICROBLAZE=y CONFIG_PLATFORM_GENERIC=y CONFIG_OPT_LIB_FUNCTION=y CONFIG_KERNEL_BASE_ADDR=0x50000000 @@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 CONFIG_XILINX_MICROBLAZE0_USE_FPU=1 CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" -CONFIG_CMDLINE_FORCE=y CONFIG_PCI=y CONFIG_PCI_XILINX=y CONFIG_DTC=y @@ -20,18 +20,8 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_XILINX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_AXI_EMAC=y -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index 652b68c03..c49b961b3 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -1,3 +1,4 @@ +CONFIG_MICROBLAZE=y CONFIG_PLATFORM_GENERIC=y CONFIG_OPT_LIB_FUNCTION=y CONFIG_KERNEL_BASE_ADDR=0x90000000 @@ -9,7 +10,6 @@ CONFIG_XILINX_MICROBLAZE0_USE_DIV=0 CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=1 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" -CONFIG_CMDLINE_FORCE=y CONFIG_PCI=y CONFIG_PCI_XILINX=y CONFIG_DTC=y @@ -17,18 +17,8 @@ CONFIG_OF=y CONFIG_PROC_DEVICETREE=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_XILINX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=y -CONFIG_GPIOLIB=y -CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_XILINX=y diff --git a/target/sh/Makefile b/target/sh/Makefile index b7160a509..98c5fb3ce 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -26,7 +26,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif @@ -35,8 +35,8 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: createinitramfs @cp $(KERNEL) $(FW_DIR)/${TARGET_KERNEL} @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_SH),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-{CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index 54f13fb65..a872b20dc 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -8,6 +8,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb index 70365d7d4..aeffc92b6 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB + select ADK_TARGET_KERNEL_ZIMAGE help Support for Qemu Emulator (superh). |