[OpenWrt-Devel] [PATCH v2 2/3] ar71xx/image: allow builds of loader without cmdline injecting

[John Crispin]

On 10/03/2016 20:27, Alexander Couzens wrote:
> On Wed, 9 Mar 2016 06:15:50 +0100
> John Crispin <blogic at openwrt.org> wrote:
> 
>>>  target/linux/ar71xx/image/Makefile | 10 +++++++---
>>>  1 file changed, 7 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/target/linux/ar71xx/image/Makefile
>>> b/target/linux/ar71xx/image/Makefile index 068d293..723ce9d 100644
>>> --- a/target/linux/ar71xx/image/Makefile
>>> +++ b/target/linux/ar71xx/image/Makefile
>>> @@ -78,7 +78,7 @@ define Build/loader-common
>>>  	$(MAKE) -C lzma-loader \
>>>  		PKG_BUILD_DIR="$@.src" \
>>>  		TARGET_DIR="$(dir $@)" LOADER_NAME="$(notdir $@)" \
>>> -		KERNEL_CMDLINE="$(CMDLINE)" BOARD="$(BOARDNAME)" \
>>> +		BOARD="$(BOARDNAME)" \
>>>  		LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \
>>>  		$(1) compile loader.$(LOADER_TYPE)
>>>  	mv "$@.$(LOADER_TYPE)" "$@"
>>> @@ -86,13 +86,17 @@ define Build/loader-common
>>>  endef
>>>  
>>>  define Build/loader-okli-compile
>>> -	$(call Build/loader-common,FLASH_OFFS=$(LOADER_FLASH_OFFS)
>>> FLASH_MAX=0)
>>> +	$(call Build/loader-common,FLASH_OFFS=$(LOADER_FLASH_OFFS)
>>> FLASH_MAX=0 KERNEL_CMDLINE="$(CMDLINE)") endef
>>>  
>>>  define Build/loader-kernel
>>>  	$(call Build/loader-common,LOADER_DATA="$@")
>>>  endef  
>>
>>
>> the above will break. did not check if there are more invocations of
>> loader-common. you really should check all of them. please mae sure
>> the patch generates no regressions
> why that?
> 
> tested against the 1043nd 
> 
> 

ok, not sure what i thought was wrong the last time ....
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel