diff options
| -rw-r--r-- | package/u-boot/Makefile | 1 | ||||
| -rw-r--r-- | target/arm/Makefile | 6 | ||||
| -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/pcduino-3b | 2 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelcfg | 1 |
6 files changed, 33 insertions, 1 deletions
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 79ffd8a04..5162ada34 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -39,6 +39,7 @@ UBOOT:= u-boot.img endif ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) CONFIG:= Linksprite_pcDuino3_defconfig +UBOOT:= u-boot-sunxi-with-spl.bin endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig diff --git a/target/arm/Makefile b/target/arm/Makefile index 48343993a..9ca6969a1 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -202,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: @@ -244,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/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/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 99cd55de2..f8d33d5b7 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -50,6 +50,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "sunxi_defconfig" if ADK_TARGET_SYSTEM_ORANGE_PI0 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_P2_ZERO default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_PRO + default "sunxi_defconfig" if ADK_TARGET_SYSTEM_PCDUINO_3B default "edosk2674_defconfig" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 default "x86_64_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86_64 default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 |