diff options
Diffstat (limited to 'target/arm')
-rw-r--r-- | target/arm/Makefile | 26 | ||||
-rw-r--r-- | target/arm/kernel/linksys-nslu2 | 110 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-spitz | 46 | ||||
-rw-r--r-- | target/arm/kernel/qemu-arm-terrier | 46 | ||||
-rw-r--r-- | target/arm/pcduino-3b/extlinux.conf | 4 | ||||
-rw-r--r-- | target/arm/pcduino-3b/genimage.cfg | 20 | ||||
-rw-r--r-- | target/arm/systems/linksys-nslu2 | 6 | ||||
-rw-r--r-- | target/arm/systems/pcduino-3b | 2 | ||||
-rw-r--r-- | target/arm/systems/qemu-arm-spitz | 11 | ||||
-rw-r--r-- | target/arm/systems/qemu-arm-terrier | 11 | ||||
-rw-r--r-- | target/arm/systems/st-stm32f746g | 1 | ||||
-rw-r--r-- | target/arm/uclibc-ng.config | 3 |
12 files changed, 155 insertions, 131 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 9ce20ef4f..227cc97ca 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -23,12 +23,6 @@ QEMU_ARGS:=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) QEMU_ARGS+=-M xilinx-zynq-a9 -dtb $(FW_DIR)/zynq-zc702.dtb -serial null -serial mon:stdio endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) -QEMU_ARGS+=-M spitz -endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER),y) -QEMU_ARGS+=-M terrier -endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif @@ -50,7 +44,7 @@ ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "#################################################" @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -135,10 +129,6 @@ ifeq ($(ADK_TARGET_FS),nfsroot) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) - @echo "Use following in RedBoot bootloader:" - @echo "RedBoot> ip_address -l <localip> -h <serverip>; load -r -v -b 0x01d00000 ${TARGET_KERNEL}; exec 0x01d00000" -endif endif ifeq ($(ADK_TARGET_FS),squashfs) targethelp: @@ -208,6 +198,12 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) VENDOR:=allwinner/ endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) +VENDOR:=allwinner/ +endif +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) +VENDOR:=intel/ixp/ +endif endif dtb-install: @@ -250,6 +246,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) ${KERNEL_MAKE} $(VENDOR)sun7i-a20-bananapro.dtb $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) + ${KERNEL_MAKE} $(VENDOR)sun7i-a20-pcduino3.dtb $(MAKE_TRACE) +endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) ${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE) endif @@ -272,6 +271,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) ${KERNEL_MAKE} $(VENDOR)stm32f746-disco.dtb $(MAKE_TRACE) endif +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_NSLU2),y) + ${KERNEL_MAKE} $(VENDOR)intel-ixp42x-linksys-nslu2.dtb $(MAKE_TRACE) +endif for x in $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb; do \ [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb $(FW_DIR); \ break; \ @@ -294,7 +296,7 @@ ifeq (${ADK_TARGET_FS},genimage) imageinstall: dtb-install $(FW_DIR)/$(GENIMAGE) targethelp endif ifeq ($(ADK_TARGET_FS),nfsroot) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +imageinstall: kernel-install dtb-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: $(BUILD_DIR)/root.squashfs kernel-install dtb-install targethelp diff --git a/target/arm/kernel/linksys-nslu2 b/target/arm/kernel/linksys-nslu2 index a0a941721..39eb3e89f 100644 --- a/target/arm/kernel/linksys-nslu2 +++ b/target/arm/kernel/linksys-nslu2 @@ -1,4 +1,7 @@ CONFIG_ARM=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V5=y +CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_IXDP425=y CONFIG_ARCH_IXDP4XX=y CONFIG_ARCH_IXP4XX=y @@ -7,6 +10,111 @@ CONFIG_ATAGS=y CONFIG_CPU_XSCALE=y CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_QMGR=y -CONFIG_IXP4XX_WATCHDOG=y CONFIG_MACH_NSLU2=y CONFIG_FPE_NWFPE=y +CONFIG_ARM_APPENDED_DTB=y +CONFIG_ARM_THUMB=y +CONFIG_KUSER_HELPERS=y + +CONFIG_FW_LOADER=y +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +CONFIG_REGMAP=y +CONFIG_REGMAP_MMIO=y +CONFIG_INTEL_IXP4XX_EB=y +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_NOSWAP=y +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +CONFIG_MTD_OTP=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_PHYSMAP_IXP4XX=y +CONFIG_NET_VENDOR_XSCALE=y +CONFIG_IXP4XX_ETH=y +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +CONFIG_PHYLIB_LEDS=y +CONFIG_FIXED_PHY=y +CONFIG_AMD_PHY=y +CONFIG_REALTEK_PHY=y +CONFIG_REALTEK_PHY_HWMON=y +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_FWNODE_MDIO=y +CONFIG_OF_MDIO=y +CONFIG_MDIO_DEVRES=y +CONFIG_IXP4XX_HSS=y +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_16550A_VARIANTS=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_MCTRL_GPIO=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_IXP4XX=y +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_GPIO=y +CONFIG_I2C_IOP3XX=y +CONFIG_PTP_1588_CLOCK_OPTIONAL=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_OF_GPIO=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_CDEV=y +CONFIG_GPIO_GENERIC=y +CONFIG_GPIO_IXP4XX=y +CONFIG_GPIO_GW_PLD=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_HWMON=y +CONFIG_RTC_LIB=y +CONFIG_RTC_MC146818_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_SYSTOHC=y +CONFIG_RTC_SYSTOHC_DEVICE="rtc0" +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_I2C_AND_SPI=y +CONFIG_RTC_DRV_CMOS=y +CONFIG_STAGING=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_CLKSRC_MMIO=y +CONFIG_IXP4XX_TIMER=y +CONFIG_IXP4XX_QMGR=y +CONFIG_IXP4XX_NPE=y +CONFIG_IRQCHIP=y +CONFIG_IXP4XX_IRQ=y diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz deleted file mode 100644 index 09a1d76ff..000000000 --- a/target/arm/kernel/qemu-arm-spitz +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y -CONFIG_MACH_SPITZ=y -CONFIG_PXA27x=y -CONFIG_PXA_SHARP_Cxx00=y -CONFIG_SHARPSL_PM=y -CONFIG_SHARPSL_PM_MAX1111=y -CONFIG_PXA_SSP=y -CONFIG_PLAT_PXA=y -CONFIG_CPU_XSCALE=y -CONFIG_IWMMXT=y -CONFIG_XSCALE_PMU=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_SHARP_PARAM=y -CONFIG_SHARP_SCOOP=y -CONFIG_ATAGS=y -CONFIG_ATAGS_PROC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_PXA=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_APM_POWER=y -CONFIG_SENSORS_MAX1111=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_HID=y -CONFIG_HID_GENERIC=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_NON8250=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier deleted file mode 100644 index e8a01e232..000000000 --- a/target/arm/kernel/qemu-arm-terrier +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_PXA=y -CONFIG_PXA_SHARPSL=y -CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y -CONFIG_MACH_BORZOI=y -CONFIG_PXA27x=y -CONFIG_PXA_SHARP_Cxx00=y -CONFIG_SHARPSL_PM=y -CONFIG_SHARPSL_PM_MAX1111=y -CONFIG_PXA_SSP=y -CONFIG_PLAT_PXA=y -CONFIG_CPU_XSCALE=y -CONFIG_IWMMXT=y -CONFIG_XSCALE_PMU=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_SHARP_PARAM=y -CONFIG_SHARP_SCOOP=y -CONFIG_ATAGS=y -CONFIG_ATAGS_PROC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_PXA=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_PXA2XX_DMA=y -CONFIG_SPI_PXA2XX=y -CONFIG_GPIO_DEVRES=y -CONFIG_GPIOLIB=y -CONFIG_GPIO_PXA=y -CONFIG_POWER_SUPPLY=y -CONFIG_PDA_POWER=y -CONFIG_APM_POWER=y -CONFIG_SENSORS_MAX1111=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=y -CONFIG_LCD_CORGI=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_HID=y -CONFIG_HID_GENERIC=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_NON8250=y -CONFIG_SERIAL_PXA_CONSOLE=y -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y diff --git a/target/arm/pcduino-3b/extlinux.conf b/target/arm/pcduino-3b/extlinux.conf new file mode 100644 index 000000000..dbbb487c0 --- /dev/null +++ b/target/arm/pcduino-3b/extlinux.conf @@ -0,0 +1,4 @@ +LABEL default + kernel /boot/kernel + devicetreedir /boot + append root=PARTUUID=f6c8cabe-f191-4392-89bb-2ba14119482e rootwait console=${console} rootfstype=ext4 panic=10 diff --git a/target/arm/pcduino-3b/genimage.cfg b/target/arm/pcduino-3b/genimage.cfg new file mode 100644 index 000000000..9d2d124f1 --- /dev/null +++ b/target/arm/pcduino-3b/genimage.cfg @@ -0,0 +1,20 @@ +image sdcard.img { + partition u-boot { + in-partition-table = false + image = "u-boot-sunxi-with-spl.bin" + offset = 8K + size = 1000K # 1MB - 8KB(offset) - 16KB(GPT) + } + + hdimage { + partition-table-type = "gpt" + gpt-location = 1008K # 1MB - 16KB(GPT) + gpt-no-backup = true + } + + partition rootfs { + offset = 1M + image = "rootfs.ext" + partition-uuid = f6c8cabe-f191-4392-89bb-2ba14119482e + } +} diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 72f55eadd..18333a17c 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -4,15 +4,17 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE - select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_I2C + select ADK_TARGET_WITH_MTD + select ADK_TARGET_WITH_PCI select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_KERNEL_WITH_COMPRESSION select ADK_PACKAGE_IXP4XX_MICROCODE + select ADK_PACKAGE_APEX + select ADK_HOST_BUILD_UPSLUG2 help Linksys NSLU2 diff --git a/target/arm/systems/pcduino-3b b/target/arm/systems/pcduino-3b index 71763d2e1..c146b59c0 100644 --- a/target/arm/systems/pcduino-3b +++ b/target/arm/systems/pcduino-3b @@ -12,7 +12,7 @@ config ADK_TARGET_SYSTEM_PCDUINO_3B select ADK_TARGET_WITH_NET select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK - select ADK_TARGET_KERNEL_IMAGE + select ADK_TARGET_KERNEL_ZIMAGE select ADK_PACKAGE_U_BOOT help PCduino 3b diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz deleted file mode 100644 index d97c5868e..000000000 --- a/target/arm/systems/qemu-arm-spitz +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ - bool "Qemu Emulator (Spitz PDA)" - depends on ADK_TARGET_OS_LINUX - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_XSCALE - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Spitz PDA). - diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier deleted file mode 100644 index 2fe25fc0f..000000000 --- a/target/arm/systems/qemu-arm-terrier +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER - bool "Qemu Emulator (Terrier PDA)" - depends on ADK_TARGET_OS_LINUX - select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_XSCALE - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Terrier PDA). - diff --git a/target/arm/systems/st-stm32f746g b/target/arm/systems/st-stm32f746g index 4b87b9340..eb68dbfe4 100644 --- a/target/arm/systems/st-stm32f746g +++ b/target/arm/systems/st-stm32f746g @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F746G select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M7 select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_SOFT_FLOAT select ADK_TARGET_WITH_SERIAL select ADK_TARGET_UCLINUX select ADK_TARGET_KERNEL_WITH_COMPRESSION diff --git a/target/arm/uclibc-ng.config b/target/arm/uclibc-ng.config index 64accdcd0..f4b47ffaa 100644 --- a/target/arm/uclibc-ng.config +++ b/target/arm/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.47 C Library Configuration +# uClibc-ng 1.0.51 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -60,6 +60,7 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y DO_XSI_MATH=y +UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y |