EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

imx-bootlets: refresh patches

Browse Source 
Tidy this up a little.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2021-02-24 16:15:02 +01:00
parent 9b37db5caa
commit 702147b797
3 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/boot/imx-bootlets/patches/001-skip_sb_generation.patch
View File

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

6
package/boot/imx-bootlets/patches/002-set_elftosb_config.patch
View File

@ -1,6 +1,6 @@
--- imx-bootlets-10.05.02.orig/linux_prebuilt.db 2010-05-14 06:56:28.000000000 +0200 --- a/linux_prebuilt.db
+++ imx-bootlets-10.05.02/linux_prebuilt.db 2012-10-24 22:04:37.000000000 +0200 +++ b/linux_prebuilt.db
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@ options {
flags = 0x01; flags = 0x01;
} }
sources { sources {

45
package/boot/imx-bootlets/patches/003-add-olinuxino.patch
View File

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