diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/sys-available/toolchain-arm | 4 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-armeb | 11 | ||||
-rw-r--r-- | target/config/Config.in | 2 | ||||
-rw-r--r-- | target/linux/kernel.config | 3 | ||||
-rw-r--r-- | target/microblaze/Makefile | 8 | ||||
-rw-r--r-- | target/microblaze/kernel/qemu-microblaze-ml605 | 12 | ||||
-rw-r--r-- | target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 12 | ||||
-rw-r--r-- | target/ppc/kernel/qemu-ppc | 3 | ||||
-rw-r--r-- | target/ppc/sys-available/toolchain-ppc | 1 | ||||
-rw-r--r-- | target/ppc64/sys-available/toolchain-ppc64 | 1 | ||||
-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 | ||||
-rw-r--r-- | target/tarch.lst | 1 | ||||
-rw-r--r-- | target/x86/kernel/qemu-i686 | 3 |
15 files changed, 24 insertions, 45 deletions
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 8ac2da8b6..2cbe76a2e 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_arm select ADK_toolchain_arm select ADK_little + select ADK_soft_float select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_PACKAGE_TGZ help - ARM toolchain (little endian). - + ARM toolchain (soft float). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb deleted file mode 100644 index ad9d2117a..000000000 --- a/target/arm/sys-available/toolchain-armeb +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB - bool "Toolchain only (big endian)" - select ADK_arm - select ADK_toolchain_armeb - select ADK_big - select ADK_TOOLCHAIN - select ADK_EABI - select ADK_TARGET_PACKAGE_TGZ - help - ARM toolchain (big endian). - diff --git a/target/config/Config.in b/target/config/Config.in index f59bdd5b7..cb28f5203 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 @@ -707,6 +708,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/Makefile b/target/microblaze/Makefile index c3b6dfa7e..e9a4a517d 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -25,7 +25,7 @@ imageinstall: $(BUILD_DIR)/root.squashfs @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS) $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) @@ -33,7 +33,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSJFFS2) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSJFFS2) $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -43,7 +43,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS} $(DTB)' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -52,6 +52,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifneq ($(ADK_HARDWARE_QEMU),) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} $(DTB) -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} -M $(MODEL) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(DTB)' endif endif 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/ppc/kernel/qemu-ppc b/target/ppc/kernel/qemu-ppc index d3cada6ae..08dd506b5 100644 --- a/target/ppc/kernel/qemu-ppc +++ b/target/ppc/kernel/qemu-ppc @@ -30,6 +30,9 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y +CONFIG_SATA_PMP=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y CONFIG_PATA_MACIO=y CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 340834f16..54e35e6a5 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC bool "Toolchain only" select ADK_ppc select ADK_toolchain_ppc + select ADK_CPU_PPC select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 5a38c89f0..3615aab85 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 bool "Toolchain only" select ADK_ppc64 select ADK_toolchain_ppc64 + select ADK_CPU_PPC64 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help 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). diff --git a/target/tarch.lst b/target/tarch.lst index 239c496df..e7251f8d2 100644 --- a/target/tarch.lst +++ b/target/tarch.lst @@ -1,5 +1,4 @@ arm -armeb m68k microblaze microblazeel diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686 index 6138c6ad2..8becb88b7 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-i686 @@ -10,6 +10,9 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y +CONFIG_SATA_PMP=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y CONFIG_ATA_PIIX=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y |