diff options
Diffstat (limited to 'target')
70 files changed, 166 insertions, 7239 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/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf new file mode 100644 index 000000000..0517118c3 --- /dev/null +++ b/target/arm/sys-available/toolchain-armhf @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF + bool "Toolchain only (hard float)" + select ADK_arm + select ADK_toolchain_armhf + select ADK_little + select ADK_hard_float + select ADK_TOOLCHAIN + select ADK_EABIHF + select ADK_TARGET_PACKAGE_TGZ + help + ARM toolchain (hard float). + diff --git a/target/config/Config.in b/target/config/Config.in index a433eb713..00e7eefe3 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 @@ -118,6 +119,15 @@ config ADK_n64 config ADK_TARGET_ABI string + default "n32" if ADK_n32 + default "n64" if ADK_n64 + default "32" if ADK_32 + default "x32" if ADK_x32 + default "eabi" if ADK_EABI + default "eabihf" if ADK_EABIHF + +config ADK_TARGET_MIPS_ABI + string default "32" if ADK_o32 default "n32" if ADK_n32 default "64" if ADK_n64 @@ -193,6 +203,8 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-mips64el" if ADK_TARGET_SYSTEM_QEMU_MIPS64EL default "qemu-ppc" if ADK_TARGET_SYSTEM_QEMU_PPC default "qemu-ppc64" if ADK_TARGET_SYSTEM_QEMU_PPC64 + default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4 + default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 @@ -651,6 +663,7 @@ config ADK_TARGET_LIB_EGLIBC prompt "Embedded GNU C library" boolean select ADK_eglibc + select ADK_HOST_NEED_GPERF depends on \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ @@ -696,6 +709,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 @@ -720,6 +734,10 @@ config ADK_TARGET_SUFFIX default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI + default "n64" if ADK_n64 + default "n32" if ADK_n32 + default "32" if ADK_32 + default "x32" if ADK_x32 default "gnu" choice @@ -768,6 +786,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS + select ADK_HOST_NEED_SQUASHFS depends on ADK_TARGET_WITH_MTD help highly compressed read-only filesystem for MTD flash systems. @@ -776,6 +795,7 @@ config ADK_TARGET_ROOTFS_JFFS2 bool "Compressed read-write root filesystem (jffs2)" select ADK_KERNEL_MISC_FILESYSTEMS select ADK_KERNEL_JFFS2 + select ADK_HOST_NEED_JFFS2 depends on ADK_TARGET_WITH_MTD help compressed read-write filesystem for MTD flash systems. @@ -834,6 +854,7 @@ config ADK_TARGET_ROOTFS_GENEXT2FS depends on ADK_TARGET_WITH_CF select ADK_KERNEL_EXT2_FS select ADK_KERNEL_SCSI + select ADK_HOST_NEED_GENEXT2FS help Use this option if you have a compact flash based system. (ext2 filesystem is used.) @@ -854,6 +875,8 @@ config ADK_TARGET_ROOTFS_ISO select ADK_KERNEL_JOLIET select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SR + select ADK_HOST_NEED_MKISOFS + select ADK_HOST_NEED_SYSLINUX depends on ADK_HOST_LINUX depends on ADK_LINUX_X86 help @@ -861,6 +884,7 @@ config ADK_TARGET_ROOTFS_ISO config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" + select ADK_HOST_NEED_GENEXT2FS if ADK_HARDWARE_QEMU select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU depends on !ADK_LINUX_MICROBLAZE help diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 31246458d..cf92eadee 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -1,3 +1,43 @@ +config ADK_HOST_NEED_MKISOFS + boolean + default n + +config ADK_HOST_NEED_SYSLINUX + boolean + default n + +config ADK_HOST_NEED_GPERF + boolean + default n + +config ADK_HOST_NEED_SQUASHFS + boolean + default n + +config ADK_HOST_NEED_JFFS2 + boolean + default n + +config ADK_HOST_NEED_GENEXT2FS + boolean + default n + +config ADK_HOST_NEED_LZOP + boolean + default n + +config ADK_HOST_NEED_LZMA + boolean + default n + +config ADK_HOST_NEED_BZIP2 + boolean + default n + +config ADK_HOST_NEED_XZ + boolean + default n + config ADK_TOOLS_ADDPATTERN_ARGS string default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index db1ab5c57..d928cea09 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -11,18 +11,22 @@ config ADK_KERNEL_INITRAMFS_COMPRESSION_NONE boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_XZ + select ADK_HOST_NEED_XZ boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA + select ADK_HOST_NEED_LZMA boolean config ADK_KERNEL_INITRAMFS_COMPRESSION_LZO + select ADK_HOST_NEED_LZOP boolean -config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP +config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 + select ADK_HOST_NEED_BZIP2 boolean -config ADK_KERNEL_INITRAMFS_COMPRESSION_BZIP2 +config ADK_KERNEL_INITRAMFS_COMPRESSION_GZIP boolean config ADK_KERNEL_RD_GZIP 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 7a411aa95..e9a4a517d 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -9,11 +9,6 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) -tools-compile: - $(MAKE) -C ../tools/mtd-utils all - $(MAKE) -C ../tools/xz all - $(MAKE) -C ../tools/squashfs all - ifeq ($(ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605),y) MODEL:=petalogix-ml605 DTB:=-dtb target/microblaze/ml605.dtb @@ -24,21 +19,21 @@ DTB:= endif ifeq ($(ADK_TARGET_FS),squashfs) -imageinstall: tools-compile $(BUILD_DIR)/root.squashfs +imageinstall: $(BUILD_DIR)/root.squashfs qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @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) -imageinstall: tools-compile $(FW_DIR)/$(ROOTFSJFFS2) +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) @@ -48,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) @@ -57,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/mips/Makefile b/target/mips/Makefile index 31cbc319a..5ebbe5d7d 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -11,16 +11,8 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id -tools-compile: - $(MAKE) -C ../tools/trx all - $(MAKE) -C ../tools/addpattern all - $(MAKE) -C ../tools/srec2bin all - $(MAKE) -C ../tools/squashfs all - $(MAKE) -C ../tools/lzma all - $(MAKE) -C ../tools/lzma-loader all - ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y) -kernel-install: tools-compile +kernel-install: ${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinuz.elf \ ${BUILD_DIR}/${TARGET_KERNEL} @@ -39,7 +31,7 @@ endif endif ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) -kernel-install: tools-compile +kernel-install: ${TARGET_CROSS}objcopy -S -O srec $(KERNEL) $(LINUX_DIR)/vmlinux.srec PATH='${TARGET_PATH}' srec2bin $(LINUX_DIR)/vmlinux.srec $(LINUX_DIR)/vmlinux.bin (dd if=/dev/zero bs=16 count=1; cat $(LINUX_DIR)/vmlinux.bin) > $(LINUX_DIR)/vmlinux.tmp @@ -56,7 +48,7 @@ kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) endif ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) -kernel-install: tools-compile +kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) ${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs 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)</ |