diff mbox

[U-Boot] rockchip: make configure_emmc() empty for Firefly-RK3288

Message ID 1457184722-2194-1-git-send-email-naobsd@gmail.com
State Accepted
Commit 87cef34576f5d0e7f094d99521e57537fef256de
Delegated to: Simon Glass
Headers show

Commit Message

FUKAUMI Naoki March 5, 2016, 1:32 p.m. UTC
on v2016.03-rc3, size of SPL image compiled by gcc 5.3.0 is too large for
Firefly-RK3288. (it's fine for Rock2)

$ gcc --version
gcc (Ubuntu/Linaro 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
Copyright (C) 2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

$ ./tools/mkimage -n rk3288 -T rksd -d spl/u-boot-spl-dtb.bin u-boot-spl-dtb.img
Warning: SPL image is too large (size 0x80d0) and will not boot

to reduce size of SPL image, this patch makes configure_emmc() empty for
Firefly-RK3288 as same as Rock2.

Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
---
 arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass March 7, 2016, 2:38 a.m. UTC | #1
On 5 March 2016 at 06:32, FUKAUMI Naoki <naobsd@gmail.com> wrote:
> on v2016.03-rc3, size of SPL image compiled by gcc 5.3.0 is too large for
> Firefly-RK3288. (it's fine for Rock2)
>
> $ gcc --version
> gcc (Ubuntu/Linaro 5.3.0-3ubuntu1~14.04) 5.3.0 20151204
> Copyright (C) 2015 Free Software Foundation, Inc.
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>
> $ ./tools/mkimage -n rk3288 -T rksd -d spl/u-boot-spl-dtb.bin u-boot-spl-dtb.img
> Warning: SPL image is too large (size 0x80d0) and will not boot
>
> to reduce size of SPL image, this patch makes configure_emmc() empty for
> Firefly-RK3288 as same as Rock2.
>
> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
> ---
>  arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>
Vagrant Cascadian March 8, 2016, 6:46 p.m. UTC | #2
On 2016-03-05, FUKAUMI Naoki wrote:
> on v2016.03-rc3, size of SPL image compiled by gcc 5.3.0 is too large for
> Firefly-RK3288. (it's fine for Rock2)
...
> to reduce size of SPL image, this patch makes configure_emmc() empty for
> Firefly-RK3288 as same as Rock2.
>
> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Fixed booting on my Firefly-RK3288.

Tested-By: Vagrant Cascadian <vagrant@debian.org>

> ---
>  arch/arm/mach-rockchip/rk3288-board-spl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
> index 6a54368..e133cca 100644
> --- a/arch/arm/mach-rockchip/rk3288-board-spl.c
> +++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
> @@ -114,7 +114,7 @@ static void configure_l2ctlr(void)
>  #ifdef CONFIG_SPL_MMC_SUPPORT
>  static int configure_emmc(struct udevice *pinctrl)
>  {
> -#ifndef CONFIG_TARGET_ROCK2
> +#if !defined(CONFIG_TARGET_ROCK2) && !defined(CONFIG_TARGET_FIREFLY_RK3288)
>  	struct gpio_desc desc;
>  	int ret;
>
Simon Glass March 10, 2016, 3:40 p.m. UTC | #3
On 8 March 2016 at 11:46, Vagrant Cascadian <vagrant@debian.org> wrote:
> On 2016-03-05, FUKAUMI Naoki wrote:
>> on v2016.03-rc3, size of SPL image compiled by gcc 5.3.0 is too large for
>> Firefly-RK3288. (it's fine for Rock2)
> ...
>> to reduce size of SPL image, this patch makes configure_emmc() empty for
>> Firefly-RK3288 as same as Rock2.
>>
>> Signed-off-by: FUKAUMI Naoki <naobsd@gmail.com>
>> Acked-by: Simon Glass <sjg@chromium.org>
>
> Fixed booting on my Firefly-RK3288.
>
> Tested-By: Vagrant Cascadian <vagrant@debian.org>

Applied to u-boot-rockchip, thanks!
diff mbox

Patch

diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
index 6a54368..e133cca 100644
--- a/arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
@@ -114,7 +114,7 @@  static void configure_l2ctlr(void)
 #ifdef CONFIG_SPL_MMC_SUPPORT
 static int configure_emmc(struct udevice *pinctrl)
 {
-#ifndef CONFIG_TARGET_ROCK2
+#if !defined(CONFIG_TARGET_ROCK2) && !defined(CONFIG_TARGET_FIREFLY_RK3288)
 	struct gpio_desc desc;
 	int ret;