| Message ID | 04c76874-b39d-cc76-f0e2-1e17e72978dd@suse.de |
|---|---|
| State | Not Applicable |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Andreas, On 20 April 2017 at 20:54, Andreas Färber <afaerber@suse.de> wrote: > Am 21.04.2017 um 04:43 schrieb Andreas Färber: >> Am 21.04.2017 um 04:24 schrieb Andreas Färber: >>> Hi Simon, >>> >>> Am 21.04.2017 um 04:10 schrieb Simon Glass: >>>> I just tested mainline with those two changes and it works for me. I >>>> pushed my patch to u-boot-rockchip/firefly-working. Can you try again? >>> >>> Confirming that with your defconfig it fully works again. >>> >>> I had instead run menuconfig and manually (un)selected the options. >>> Maybe those options influence other defaults? I was at the same qoriq >>> merge commit your branch is based off. >> >> Here's a quick diff against master: >> >> diff -u firefly/.config firefly/simon_config >> --- firefly/.config 2017-04-21 04:39:49.484215791 +0200 >> +++ firefly/simon_config 2017-04-21 04:39:07.123727380 +0200 >> @@ -169,9 +169,8 @@ >> CONFIG_ROCKCHIP_RK3288=y >> # CONFIG_ROCKCHIP_RK3328 is not set >> # CONFIG_ROCKCHIP_RK3399 is not set >> -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y >> -CONFIG_ROCKCHIP_BROM_HELPER=y >> -# CONFIG_SPL_MMC_SUPPORT is not set >> +# CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is not set >> +CONFIG_SPL_MMC_SUPPORT=y >> CONFIG_SPL_SERIAL_SUPPORT=y >> CONFIG_BOARD_SPECIFIC_OPTIONS=y >> # CONFIG_TARGET_CHROMEBOOK_JERRY is not set >> @@ -510,7 +509,7 @@ >> CONFIG_OF_SEPARATE=y >> # CONFIG_OF_EMBED is not set >> CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names >> interrupt-parent assigned-clocks assigned-clock-rates >> assigned-clock-parents" >> -# CONFIG_SPL_OF_PLATDATA is not set >> +CONFIG_SPL_OF_PLATDATA=y >> CONFIG_NET=y >> CONFIG_NET_RANDOM_ETHADDR=y >> # CONFIG_NETCONSOLE is not set >> @@ -848,6 +847,7 @@ >> # CONFIG_FSL_LPUART is not set >> # CONFIG_MVEBU_A3700_UART is not set >> CONFIG_SYS_NS16550=y >> +CONFIG_ROCKCHIP_SERIAL=y >> # CONFIG_MSM_SERIAL is not set >> # CONFIG_PXA_SERIAL is not set >> >> At least SERIAL looks important... > > ... but enabling SPL_OF_PLATDATA and ROCKCHIP_SERIAL on master (via > menuconfig) still sits at "Returning to boot ROM...". Can you diff the resulting config? There might perhaps be a broken dependency. > > Regards, > Andreas > > diff -u firefly/.config firefly/simon_config > --- firefly/.config 2017-04-21 04:47:11.165310486 +0200 > +++ firefly/simon_config 2017-04-21 04:39:07.123727380 +0200 > @@ -169,9 +169,8 @@ > CONFIG_ROCKCHIP_RK3288=y > # CONFIG_ROCKCHIP_RK3328 is not set > # CONFIG_ROCKCHIP_RK3399 is not set > -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y > -CONFIG_ROCKCHIP_BROM_HELPER=y > -# CONFIG_SPL_MMC_SUPPORT is not set > +# CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is not set > +CONFIG_SPL_MMC_SUPPORT=y > CONFIG_SPL_SERIAL_SUPPORT=y > CONFIG_BOARD_SPECIFIC_OPTIONS=y > # CONFIG_TARGET_CHROMEBOOK_JERRY is not set > > -- > SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Felix Imendörffer, Jane Smithard, Graham Norton > HRB 21284 (AG Nürnberg) Regards, Simon
diff -u firefly/.config firefly/simon_config --- firefly/.config 2017-04-21 04:47:11.165310486 +0200 +++ firefly/simon_config 2017-04-21 04:39:07.123727380 +0200 @@ -169,9 +169,8 @@ CONFIG_ROCKCHIP_RK3288=y # CONFIG_ROCKCHIP_RK3328 is not set # CONFIG_ROCKCHIP_RK3399 is not set -CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y -CONFIG_ROCKCHIP_BROM_HELPER=y -# CONFIG_SPL_MMC_SUPPORT is not set +# CONFIG_ROCKCHIP_SPL_BACK_TO_BROM is not set +CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_BOARD_SPECIFIC_OPTIONS=y # CONFIG_TARGET_CHROMEBOOK_JERRY is not set