summaryrefslogtreecommitdiff
path: root/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'target/arm')
-rw-r--r--target/arm/Makefile14
-rw-r--r--target/arm/kernel/qemu-arm-spitz46
-rw-r--r--target/arm/kernel/qemu-arm-terrier46
-rw-r--r--target/arm/pcduino-3b/extlinux.conf4
-rw-r--r--target/arm/pcduino-3b/genimage.cfg20
-rw-r--r--target/arm/systems/pcduino-3b2
-rw-r--r--target/arm/systems/qemu-arm-spitz11
-rw-r--r--target/arm/systems/qemu-arm-terrier11
-rw-r--r--target/arm/systems/st-stm32f746g1
-rw-r--r--target/arm/uclibc-ng.config3
10 files changed, 35 insertions, 123 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 9ce20ef4f..9ca6969a1 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)"
@@ -208,6 +202,9 @@ endif
ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
VENDOR:=allwinner/
endif
+ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y)
+VENDOR:=allwinner/
+endif
endif
dtb-install:
@@ -250,6 +247,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
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/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