Browse Source

pcduino-3b: enable bootup via SD card

Waldemar Brodkorb 1 month ago
parent
commit
feba3103a6

+ 1 - 0
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

+ 6 - 0
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

+ 4 - 0
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

+ 20 - 0
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
+	}
+}

+ 1 - 1
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

+ 1 - 0
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