Browse Source

uImage is mandatory, add LOADADDR

Waldemar Brodkorb 8 years ago
parent
commit
036c31b137

+ 4 - 0
mk/kernel-vars.mk

@@ -18,4 +18,8 @@ else
 KERNEL_MAKE_OPTS+=	HOSTCFLAGS='${HOST_CFLAGS}'
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
+KERNEL_MAKE_OPTS+=	LOADADDR=0x40008000
+endif
+
 KERNEL_MAKE_ENV:=	PATH="${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:$$PATH"

+ 2 - 2
package/u-boot/files/boot.script.bpi

@@ -1,4 +1,4 @@
-setenv bootargs console=ttyS0 root=/dev/mmcblk0p1
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1
 ext4load mmc 0:1 0x42000000 boot/${fdtfile}
 ext4load mmc 0:1 0x48000000 boot/kernel
-bootz 0x48000000 - 0x42000000
+bootm 0x48000000 - 0x42000000

+ 2 - 1
target/arm/kernel/banana-pro

@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_SUNXI=y
+CONFIG_SERIAL_8250_DW=y

+ 2 - 2
target/arm/systems/banana-pro

@@ -6,7 +6,6 @@ config ADK_TARGET_SYSTEM_BANANA_PRO
 	select ADK_TARGET_CPU_WITH_NEON
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_CPU_FREQ
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_INPUT
@@ -15,7 +14,8 @@ config ADK_TARGET_SYSTEM_BANANA_PRO
 	select ADK_TARGET_WITH_SPI
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_TARGET_KERNEL_UIMAGE
 	select ADK_PACKAGE_U_BOOT
 	help
 	  Banana Pro
+

+ 11 - 0
target/linux/config/Config.in.i2c

@@ -18,6 +18,17 @@ config ADK_KERNEL_I2C_BCM2708
 	help
 	  I2C driver for BCM2835 boards.
 
+config ADK_KERNEL_I2C_SUNXI
+	tristate "I2C driver for SUNXI boards"
+	select ADK_KERNEL_I2C
+	select ADK_KERNEL_REGMAP_I2C
+	select ADK_KERNEL_I2C_CHARDEV
+	depends on ADK_TARGET_SYSTEM_BANANA_PRO
+	default y if ADK_TARGET_SYSTEM_BANANA_PRO
+	default n
+	help
+	  I2C driver for SUNXI boards.
+
 config ADK_KERNEL_I2C_IMX
 	tristate "I2C driver for IMX6 boards"
 	select ADK_KERNEL_I2C