diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-30 07:23:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-30 07:45:35 +0200 |
| commit | 036c31b137e202af06bc4c0f85faaf17a78cd92d (patch) | |
| tree | 13ab2598632836c6c6266217ad7f0ad229040406 | |
| parent | 59d094721b33b834a9403ed5087ba591d28203f5 (diff) | |
uImage is mandatory, add LOADADDR
| -rw-r--r-- | mk/kernel-vars.mk | 4 | ||||
| -rw-r--r-- | package/u-boot/files/boot.script.bpi | 4 | ||||
| -rw-r--r-- | target/arm/kernel/banana-pro | 3 | ||||
| -rw-r--r-- | target/arm/systems/banana-pro | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 11 |
5 files changed, 21 insertions, 5 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 834af71cc..7e4704927 100644 --- a/mk/kernel-vars.mk +++ b/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" diff --git a/package/u-boot/files/boot.script.bpi b/package/u-boot/files/boot.script.bpi index 0e7d9cd95..761f166e3 100644 --- a/package/u-boot/files/boot.script.bpi +++ b/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 diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro index 1388ae678..c26d8a44b 100644 --- a/target/arm/kernel/banana-pro +++ b/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
\ No newline at end of file +CONFIG_SERIAL_8250_DW=y diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index 4a587c793..6e2b9fa2e 100644 --- a/target/arm/systems/banana-pro +++ b/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 + diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c index b1ee8b6ae..02c6bfa45 100644 --- a/target/linux/config/Config.in.i2c +++ b/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 |