OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 10... | Line 10... | |||
10 | Makefile | 7 ++++--- |
10 | Makefile | 7 ++++--- |
|
11 | 1 file changed, 4 insertions(+), 3 deletions(-) |
11 | 1 file changed, 4 insertions(+), 3 deletions(-) |
|
Line 12... | Line 12... | |||
12 | |
12 | |
|
13 | --- a/Makefile |
13 | --- a/Makefile |
|
14 | +++ b/Makefile |
14 | +++ b/Makefile |
|
- | 15 | @@ -1144,9 +1144,10 @@ u-boot-x86-16bit.bin: u-boot FORCE |
||
Line 15... | Line 16... | |||
15 | @@ -1255,8 +1255,10 @@ endif |
16 | endif |
|
16 | |
- | ||
17 | ifneq ($(CONFIG_ARCH_SUNXI),) |
17 | |
|
- | 18 | ifneq ($(CONFIG_ARCH_SUNXI),) |
||
18 | ifeq ($(CONFIG_ARM64),) |
19 | -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb \ |
|
19 | -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE |
20 | - checkbinman FORCE |
|
20 | - $(call if_changed,binman) |
21 | - $(call if_changed,binman) |
|
21 | +OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \ |
22 | +OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \ |
|
22 | + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff |
23 | + --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff |
|
23 | +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE |
24 | +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE |
|
24 | + $(call if_changed,pad_cat) |
- | ||
25 | else |
- | ||
26 | u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE |
- | ||
27 | $(call if_changed,cat) |
- | ||
28 | --- a/arch/arm/Kconfig |
- | ||
Line 29... | Line -... | |||
29 | +++ b/arch/arm/Kconfig |
- | ||
30 | @@ -820,7 +820,6 @@ config ARCH_SOCFPGA |
- | ||
31 | |
- | ||
32 | config ARCH_SUNXI |
- | ||
33 | bool "Support sunxi (Allwinner) SoCs" |
25 | + $(call if_changed,pad_cat) |
|
34 | - select BINMAN |
- |