[OpenWrt-Devel] uboot-lantiq: fix P-2812HNU-F1/3 package dependency
diff mbox

Message ID 1422190368-31840-1-git-send-email-a.seppala@gmail.com
State Accepted
Headers show

Commit Message

Antti Seppälä Jan. 25, 2015, 12:52 p.m. UTC
After r43987 TARGET_lantiq_xrx200_P2812HNUFX does not exist anymore.
Fix empty menuconfig bootloader selection by making u-boot depend on 
one of the new target profiles.

Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
---
 package/boot/uboot-lantiq/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Sylwester Petela Jan. 25, 2015, 2:17 p.m. UTC | #1
W dniu 2015-01-25 o 13:52, Antti Seppälä pisze:
> After r43987 TARGET_lantiq_xrx200_P2812HNUFX does not exist anymore.
> Fix empty menuconfig bootloader selection by making u-boot depend on 
> one of the new target profiles.
>
> Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
> ---
>  package/boot/uboot-lantiq/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile
> index d2b868f..d59aac8 100644
> --- a/package/boot/uboot-lantiq/Makefile
> +++ b/package/boot/uboot-lantiq/Makefile
> @@ -247,14 +247,14 @@ define uboot/p2812hnufx_ram
>    TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (RAM)
>    SOC:=vr9
>    DDR_SETTINGS:=board/zyxel/p2812hnufx/ddr_settings.h
> -  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
> +  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
>  endef
>  
>  define uboot/p2812hnufx_nandspl
>    TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (NAND SPL)
>    SOC:=vr9
>    IMAGE:=u-boot.ltq.lzo.nandspl
> -  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
> +  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
>  endef
>  
>  
That patch will fix target deps but U-Boot for this boards needs fixing.
P-2812HNU-F1 is NAND based, needs NAND_TPL image instead of SPL (needs patches provided by Antonios Vamporakis  in branch "stable_fixes_for_daniel_20140109" on Daniel github)
P-2812HNU-F3 is NOR/NAND based (boots from NOR), NOR needs to be added in board definition .

So ATM U-Boot for this boards is broken.
Antti Seppälä Jan. 25, 2015, 6:57 p.m. UTC | #2
On 25 January 2015 at 16:17, Sylwester Petela <sscapi@gmail.com> wrote:
> W dniu 2015-01-25 o 13:52, Antti Seppälä pisze:
>> After r43987 TARGET_lantiq_xrx200_P2812HNUFX does not exist anymore.
>> Fix empty menuconfig bootloader selection by making u-boot depend on
>> one of the new target profiles.
>>
>> Signed-off-by: Antti Seppälä <a.seppala@gmail.com>
>> ---
>>  package/boot/uboot-lantiq/Makefile | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile
>> index d2b868f..d59aac8 100644
>> --- a/package/boot/uboot-lantiq/Makefile
>> +++ b/package/boot/uboot-lantiq/Makefile
>> @@ -247,14 +247,14 @@ define uboot/p2812hnufx_ram
>>    TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (RAM)
>>    SOC:=vr9
>>    DDR_SETTINGS:=board/zyxel/p2812hnufx/ddr_settings.h
>> -  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
>> +  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
>>  endef
>>
>>  define uboot/p2812hnufx_nandspl
>>    TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (NAND SPL)
>>    SOC:=vr9
>>    IMAGE:=u-boot.ltq.lzo.nandspl
>> -  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
>> +  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
>>  endef
>>
>>
> That patch will fix target deps but U-Boot for this boards needs fixing.
> P-2812HNU-F1 is NAND based, needs NAND_TPL image instead of SPL (needs patches provided by Antonios Vamporakis  in branch "stable_fixes_for_daniel_20140109" on Daniel github)
> P-2812HNU-F3 is NOR/NAND based (boots from NOR), NOR needs to be added in board definition .
>
> So ATM U-Boot for this boards is broken.

I tried and it seems the ram version
(openwrt-lantiq-p2812hnufx_ram-u-boot.asc) builds and boots properly.

The openwrt-lantiq-p2812hnufx_nandspl-u-boot.img indeed does not boot
correctly. Is anyone working on fixing it? (Apparently conversion to
TPL is needed)
For F1 board it looks to me that it is just a matter of updating
u-boot version in openwrt repository and adding a few patches on top
of that.

Br,

Patch
diff mbox

diff --git a/package/boot/uboot-lantiq/Makefile b/package/boot/uboot-lantiq/Makefile
index d2b868f..d59aac8 100644
--- a/package/boot/uboot-lantiq/Makefile
+++ b/package/boot/uboot-lantiq/Makefile
@@ -247,14 +247,14 @@  define uboot/p2812hnufx_ram
   TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (RAM)
   SOC:=vr9
   DDR_SETTINGS:=board/zyxel/p2812hnufx/ddr_settings.h
-  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
+  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
 endef
 
 define uboot/p2812hnufx_nandspl
   TITLE:=U-Boot for ZyXEL P-2812HNU-Fx (NAND SPL)
   SOC:=vr9
   IMAGE:=u-boot.ltq.lzo.nandspl
-  DEPS:=@TARGET_lantiq_xrx200_P2812HNUFX
+  DEPS:=@TARGET_lantiq_xrx200_P2812HNUF1||@TARGET_lantiq_xrx200_P2812HNUF3
 endef