package/boot/uboot-sunxi/patches/213-Revert-sunxi-Use-binman-for-sunxi-boards.patch

   1 From cf1defd80b7594f6f2721ab2dacffe48522abfca Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Thu, 20 Jul 2017 19:51:01 +0200
   4 Subject: [PATCH 213/213] Revert "sunxi: Use binman for sunxi boards"
   5
   6 This reverts commit 61b994a386eb6f631dc1c2194d4cce9b1a43542c.
   7 ---
   8  Makefile                       |  6 ++++--
   9  arch/arm/dts/sunxi-u-boot.dtsi | 14 --------------
  10  scripts/Makefile.lib           |  4 ++--
  11  3 files changed, 6 insertions(+), 18 deletions(-)
  12  delete mode 100644 arch/arm/dts/sunxi-u-boot.dtsi
  13
  14 diff --git a/Makefile b/Makefile
  15 index 071efa8926..5349621baf 100644
  16 --- a/Makefile
  17 +++ b/Makefile
  18 @@ -1125,8 +1125,10 @@ u-boot-x86-16bit.bin: u-boot FORCE
  19  endif
  20
  21  ifneq ($(CONFIG_ARCH_SUNXI),)
  22 -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE
  23 -       $(call if_changed,binman)
  24 +OBJCOPYFLAGS_u-boot-sunxi-with-spl.bin = -I binary -O binary \
  25 +                                  --pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
  26 +u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img FORCE
  27 +       $(call if_changed,pad_cat)
  28  endif
  29
  30  ifneq ($(CONFIG_TEGRA),)
  31 diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
  32 deleted file mode 100644
  33 index 5adfd9bca2..0000000000
  34 --- a/arch/arm/dts/sunxi-u-boot.dtsi
  35 +++ /dev/null
  36 @@ -1,14 +0,0 @@
  37 -#include <config.h>
  38 -
  39 -/ {
  40 -       binman {
  41 -               filename = "u-boot-sunxi-with-spl.bin";
  42 -               pad-byte = <0xff>;
  43 -               blob {
  44 -                       filename = "spl/sunxi-spl.bin";
  45 -               };
  46 -               u-boot-img {
  47 -                       pos = <CONFIG_SPL_PAD_TO>;
  48 -               };
  49 -       };
  50 -};
  51 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
  52 index 54bcb166b0..6246265c91 100644
  53 --- a/scripts/Makefile.lib
  54 +++ b/scripts/Makefile.lib
  55 @@ -308,8 +308,8 @@ quiet_cmd_dtc = DTC     $@
  56  # Modified for U-Boot
  57  # Bring in any U-Boot-specific include after the '/dts-v1/;' header
  58  cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
  59 -       cat $< $(if $(u_boot_dtsi),\
  60 -               | sed 's%^/ {$$%\#include \"$(u_boot_dtsi)\"\n&%')  | \
  61 +       cat $< $(if $(u-boot-dtsi),\
  62 +               | sed 's%^/ {$$%\#include \"$(u-boot-dtsi)\"\n&%')  | \
  63                 $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \
  64         $(DTC) -O dtb -o $@ -b 0 \
  65                 -i $(dir $<) $(DTC_FLAGS) \
  66 --
  67 2.11.0
  68