mirror of https://github.com/OpenIPC/firmware.git
63 lines
2.1 KiB
Diff
Executable File
63 lines
2.1 KiB
Diff
Executable File
--- linux-3.0.101/arch/arm/boot/Makefile 2013-10-22 11:58:59.000000000 +0400
|
|
+++ linux-3.0.101/arch/arm/boot/Makefile 2021-12-15 10:51:15.956535987 +0300
|
|
@@ -59,15 +59,19 @@
|
|
|
|
endif
|
|
|
|
-quiet_cmd_uimage = UIMAGE $@
|
|
- cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
|
|
- -C none -a $(LOADADDR) -e $(STARTADDR) \
|
|
- -n 'Linux-$(KERNELRELEASE)' -d $< $@
|
|
+#quiet_cmd_uimage = UIMAGE $@
|
|
+# cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A arm -O linux -T kernel \
|
|
+# -C none -a $(LOADADDR) -e $(STARTADDR) \
|
|
+# -n 'Linux-$(KERNELRELEASE)' -d $< $@
|
|
|
|
-ifeq ($(CONFIG_ZBOOT_ROM),y)
|
|
-$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
|
|
+ifneq ($(LOADADDR),)
|
|
+ UIMAGE_LOADADDR=$(LOADADDR)
|
|
else
|
|
-$(obj)/uImage: LOADADDR=$(ZRELADDR)
|
|
+ ifeq ($(CONFIG_ZBOOT_ROM),y)
|
|
+ UIMAGE_LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
|
|
+ else
|
|
+ UIMAGE_LOADADDR=$(ZRELADDR)
|
|
+ endif
|
|
endif
|
|
|
|
$(obj)/uImage: STARTADDR=$(LOADADDR)
|
|
--- linux-3.0.101/scripts/Makefile.lib 2013-10-22 11:58:59.000000000 +0400
|
|
+++ linux-3.0.101/scripts/Makefile.lib 2021-12-15 10:53:24.551357718 +0300
|
|
@@ -262,6 +262,30 @@
|
|
lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
|
|
(rm -f $@ ; false)
|
|
|
|
+# U-Boot mkimage
|
|
+# ---------------------------------------------------------------------------
|
|
+
|
|
+MKIMAGE := $(srctree)/scripts/mkuboot.sh
|
|
+
|
|
+# SRCARCH just happens to match slightly more than ARCH (on sparc), so reduces
|
|
+# the number of overrides in arch makefiles
|
|
+UIMAGE_ARCH ?= $(SRCARCH)
|
|
+UIMAGE_COMPRESSION ?= $(if $(2),$(2),none)
|
|
+UIMAGE_OPTS-y ?=
|
|
+UIMAGE_TYPE ?= kernel
|
|
+UIMAGE_LOADADDR ?= arch_must_set_this
|
|
+UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
|
|
+UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
|
|
+UIMAGE_IN ?= $<
|
|
+UIMAGE_OUT ?= $@
|
|
+
|
|
+quiet_cmd_uimage = UIMAGE $(UIMAGE_OUT)
|
|
+ cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
|
|
+ -C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
|
|
+ -T $(UIMAGE_TYPE) \
|
|
+ -a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
|
|
+ -n $(UIMAGE_NAME) -d $(UIMAGE_IN) $(UIMAGE_OUT)
|
|
+
|
|
# XZ
|
|
# ---------------------------------------------------------------------------
|
|
# Use xzkern to compress the kernel image and xzmisc to compress other things.
|