imx-bootlets: refresh patches

Tidy this up a little.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/package/boot/imx-bootlets/patches/001-skip_sb_generation.patch b/package/boot/imx-bootlets/patches/001-skip_sb_generation.patch
index 7267dff61957445524e796ce1f5503f54539656a..ad652658503021d0718e3d22bc2d683b405918a0 100644 (file)
--- a/package/boot/imx-bootlets/patches/001-skip_sb_generation.patch
+++ b/package/boot/imx-bootlets/patches/001-skip_sb_generation.patch
@@ -1,6 +1,6 @@
---- imx-bootlets-src-10.05.02.orig/Makefile    2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-src-10.05.02/Makefile 2012-10-24 21:41:44.000000000 +0200
-@@ -32,10 +32,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -32,10 +32,11 @@ ifeq "$(DFT_IMAGE)" "$(wildcard $(DFT_IM
        sed -i 's,[^ *]image.*;,\timage="$(DFT_UBOOT)";,' uboot.db
        elftosb2 -z -c ./uboot.db -o i$(ARCH)_uboot.sb
  else

diff --git a/package/boot/imx-bootlets/patches/002-set_elftosb_config.patch b/package/boot/imx-bootlets/patches/002-set_elftosb_config.patch
index 88b904ef42f76cdb8d66dd9a43da8a7d294cf7e8..5cf48fd6fc846a38d9dbbe70cc236d4d071be5d4 100644 (file)
--- a/package/boot/imx-bootlets/patches/002-set_elftosb_config.patch
+++ b/package/boot/imx-bootlets/patches/002-set_elftosb_config.patch
@@ -1,6 +1,6 @@
---- imx-bootlets-10.05.02.orig/linux_prebuilt.db       2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/linux_prebuilt.db    2012-10-24 22:04:37.000000000 +0200
-@@ -4,10 +4,10 @@
+--- a/linux_prebuilt.db
++++ b/linux_prebuilt.db
+@@ -4,10 +4,10 @@ options {
        flags = 0x01;
  }
  sources {

diff --git a/package/boot/imx-bootlets/patches/003-add-olinuxino.patch b/package/boot/imx-bootlets/patches/003-add-olinuxino.patch
index ddc25bc41e78f07fb003886f78ad2bcb46151881..6ed57863444553e0a63050220bfda3b6a408ce2e 100644 (file)
--- a/package/boot/imx-bootlets/patches/003-add-olinuxino.patch
+++ b/package/boot/imx-bootlets/patches/003-add-olinuxino.patch
@@ -1,6 +1,5 @@
-diff -ruN imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c
---- imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c  1970-01-01 01:00:00.000000000 +0100
-+++ imx-bootlets-10.05.02/linux_prep/board/imx23_olinuxino_dev.c       2013-05-19 00:11:40.000000000 +0200
+--- /dev/null
++++ b/linux_prep/board/imx23_olinuxino_dev.c
 @@ -0,0 +1,54 @@
 +/*
 + * Platform specific data for the IMX23_OLINUXINO development board
@@ -56,15 +55,13 @@ diff -ruN imx-bootlets-10.05.02.orig/linux_prep/board/imx23_olinuxino_dev.c imx-
 + * Default command line *
 + ************************************************/
 +char cmdline_def[] = "console=ttyAMA0,115200";
-diff -ruN imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt
---- imx-bootlets-10.05.02.orig/linux_prep/cmdlines/imx23_olinuxino_dev.txt     1970-01-01 01:00:00.000000000 +0100
-+++ imx-bootlets-10.05.02/linux_prep/cmdlines/imx23_olinuxino_dev.txt  2013-05-19 00:12:56.000000000 +0200
+--- /dev/null
++++ b/linux_prep/cmdlines/imx23_olinuxino_dev.txt
 @@ -0,0 +1 @@
 +noinitrd console=ttyAMA0,115200 root=/dev/mmcblk0p2 rw rootwait ssp1=mmc
-diff -ruN imx-bootlets-10.05.02.orig/linux_prep/core/setup.c imx-bootlets-10.05.02/linux_prep/core/setup.c
---- imx-bootlets-10.05.02.orig/linux_prep/core/setup.c 2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/linux_prep/core/setup.c      2013-05-19 00:11:40.000000000 +0200
-@@ -84,6 +84,8 @@
+--- a/linux_prep/core/setup.c
++++ b/linux_prep/core/setup.c
+@@ -84,6 +84,8 @@ static void *memcpy(void *s1, const void
  #include "../../mach-mx28/includes/registers/regsrtc.h"
  #elif defined(STMP378X)
  #include "../../mach-mx23/includes/registers/regsrtc.h"
@@ -73,9 +70,8 @@ diff -ruN imx-bootlets-10.05.02.orig/linux_prep/core/setup.c imx-bootlets-10.05.
  #endif
  
  #define NAND_SECONDARY_BOOT          0x00000002
-diff -ruN imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h imx-bootlets-10.05.02/linux_prep/include/mx23/platform.h
---- imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h      2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/linux_prep/include/mx23/platform.h   2013-05-19 00:11:40.000000000 +0200
+--- a/linux_prep/include/mx23/platform.h
++++ b/linux_prep/include/mx23/platform.h
 @@ -19,6 +19,10 @@
  
  #if defined (BOARD_STMP378X_DEV)
@@ -87,10 +83,9 @@ diff -ruN imx-bootlets-10.05.02.orig/linux_prep/include/mx23/platform.h imx-boot
  #else
  #error "Allocate a machine ID for your board"
  #endif
-diff -ruN imx-bootlets-10.05.02.orig/linux_prep/Makefile imx-bootlets-10.05.02/linux_prep/Makefile
---- imx-bootlets-10.05.02.orig/linux_prep/Makefile     2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/linux_prep/Makefile  2013-05-19 00:11:40.000000000 +0200
-@@ -69,6 +69,11 @@
+--- a/linux_prep/Makefile
++++ b/linux_prep/Makefile
+@@ -69,6 +69,11 @@ ARCH = mx28
  HW_OBJS = $(LRADC_OBJS)
  CFLAGS += -DMX28 -DBOARD_MX28_EVK
  endif
@@ -102,10 +97,9 @@ diff -ruN imx-bootlets-10.05.02.orig/linux_prep/Makefile imx-bootlets-10.05.02/l
  
  # Generic code
  CORE_OBJS = entry.o resume.o cmdlines.o setup.o keys.o
-diff -ruN imx-bootlets-10.05.02.orig/Makefile imx-bootlets-10.05.02/Makefile
---- imx-bootlets-10.05.02.orig/Makefile        2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/Makefile     2013-05-19 00:15:02.000000000 +0200
-@@ -3,9 +3,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,9 +3,9 @@ MEM_TYPE ?= MEM_DDR1
  export MEM_TYPE
  
  DFT_IMAGE=$(DEV_IMAGE)/boot/zImage
@@ -117,7 +111,7 @@ diff -ruN imx-bootlets-10.05.02.orig/Makefile imx-bootlets-10.05.02/Makefile
  
  ifeq ($(BOARD), stmp37xx_dev)
  ARCH = 37xx
-@@ -16,6 +16,9 @@
+@@ -16,6 +16,9 @@ endif
  ifeq ($(BOARD), iMX28_EVK)
  ARCH = mx28
  endif
@@ -127,7 +121,7 @@ diff -ruN imx-bootlets-10.05.02.orig/Makefile imx-bootlets-10.05.02/Makefile
  
  all: build_prep gen_bootstream
  
-@@ -93,6 +96,8 @@
+@@ -94,6 +97,8 @@ distclean: clean
  clean:
        -rm -rf *.sb
        rm -f sd_mmc_bootstream.raw
@@ -136,9 +130,8 @@ diff -ruN imx-bootlets-10.05.02.orig/Makefile imx-bootlets-10.05.02/Makefile
        $(MAKE) -C linux_prep clean ARCH=$(ARCH)
        $(MAKE) -C boot_prep clean ARCH=$(ARCH)
        $(MAKE) -C power_prep clean ARCH=$(ARCH)
-diff -ruN imx-bootlets-10.05.02.orig/uboot.db imx-bootlets-10.05.02/uboot.db
---- imx-bootlets-10.05.02.orig/uboot.db        2010-05-14 06:56:28.000000000 +0200
-+++ imx-bootlets-10.05.02/uboot.db     2013-05-19 00:11:40.000000000 +0200
+--- a/uboot.db
++++ b/uboot.db
 @@ -3,7 +3,7 @@
  sources {
        power_prep="./power_prep/power_prep";