summaryrefslogtreecommitdiff
path: root/firmware/target/mips/ingenic_x1000
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/mips/ingenic_x1000')
-rw-r--r--firmware/target/mips/ingenic_x1000/erosqnative/boot.make30
-rw-r--r--firmware/target/mips/ingenic_x1000/fiiom3k/boot.make30
-rw-r--r--firmware/target/mips/ingenic_x1000/shanlingq1/boot.make31
-rw-r--r--firmware/target/mips/ingenic_x1000/x1000boot.make43
4 files changed, 42 insertions, 92 deletions
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/boot.make b/firmware/target/mips/ingenic_x1000/erosqnative/boot.make
deleted file mode 100644
index b6d0844cd0..0000000000
--- a/firmware/target/mips/ingenic_x1000/erosqnative/boot.make
+++ /dev/null
@@ -1,30 +0,0 @@
1# __________ __ ___.
2# Open \______ \ ____ ____ | | _\_ |__ _______ ___
3# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
4# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
5# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6# \/ \/ \/ \/ \/
7# $Id$
8#
9
10include $(ROOTDIR)/lib/microtar/microtar.make
11
12.SECONDEXPANSION:
13
14$(BUILDDIR)/spl.erosq: $(BUILDDIR)/spl.bin
15 $(call PRINTS,MKSPL $(@F))$(TOOLSDIR)/mkspl-x1000 -type=nand -ppb=2 -bpp=2 $< $@
16
17$(BUILDDIR)/bootloader.ucl: $(BUILDDIR)/bootloader.bin
18 $(call PRINTS,UCLPACK $(@F))$(TOOLSDIR)/uclpack --nrv2e -9 $< $@ >/dev/null
19
20.PHONY: $(BUILDDIR)/bootloader-info.txt
21$(BUILDDIR)/bootloader-info.txt:
22 $(call PRINTS,GEN $(@F))echo $(SVNVERSION) > $@
23
24$(BUILDDIR)/$(BINARY): $(BUILDDIR)/spl.erosq \
25 $(BUILDDIR)/bootloader.ucl \
26 $(BUILDDIR)/bootloader-info.txt
27 $(call PRINTS,TAR $(@F))tar -C $(BUILDDIR) \
28 --numeric-owner --no-acls --no-xattrs --no-selinux \
29 --mode=0644 --owner=0 --group=0 \
30 -cf $@ $(call full_path_subst,$(BUILDDIR)/%,%,$^)
diff --git a/firmware/target/mips/ingenic_x1000/fiiom3k/boot.make b/firmware/target/mips/ingenic_x1000/fiiom3k/boot.make
deleted file mode 100644
index 77b23167c2..0000000000
--- a/firmware/target/mips/ingenic_x1000/fiiom3k/boot.make
+++ /dev/null
@@ -1,30 +0,0 @@
1# __________ __ ___.
2# Open \______ \ ____ ____ | | _\_ |__ _______ ___
3# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
4# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
5# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6# \/ \/ \/ \/ \/
7# $Id$
8#
9
10include $(ROOTDIR)/lib/microtar/microtar.make
11
12.SECONDEXPANSION:
13
14$(BUILDDIR)/spl.m3k: $(BUILDDIR)/spl.bin
15 $(call PRINTS,MKSPL $(@F))$(TOOLSDIR)/mkspl-x1000 -type=nand -ppb=2 -bpp=2 $< $@
16
17$(BUILDDIR)/bootloader.ucl: $(BUILDDIR)/bootloader.bin
18 $(call PRINTS,UCLPACK $(@F))$(TOOLSDIR)/uclpack --nrv2e -9 $< $@ >/dev/null
19
20.PHONY: $(BUILDDIR)/bootloader-info.txt
21$(BUILDDIR)/bootloader-info.txt:
22 $(call PRINTS,GEN $(@F))echo $(SVNVERSION) > $@
23
24$(BUILDDIR)/$(BINARY): $(BUILDDIR)/spl.m3k \
25 $(BUILDDIR)/bootloader.ucl \
26 $(BUILDDIR)/bootloader-info.txt
27 $(call PRINTS,TAR $(@F))tar -C $(BUILDDIR) \
28 --numeric-owner --no-acls --no-xattrs --no-selinux \
29 --mode=0644 --owner=0 --group=0 \
30 -cf $@ $(call full_path_subst,$(BUILDDIR)/%,%,$^)
diff --git a/firmware/target/mips/ingenic_x1000/shanlingq1/boot.make b/firmware/target/mips/ingenic_x1000/shanlingq1/boot.make
deleted file mode 100644
index 639f570ea3..0000000000
--- a/firmware/target/mips/ingenic_x1000/shanlingq1/boot.make
+++ /dev/null
@@ -1,31 +0,0 @@
1# __________ __ ___.
2# Open \______ \ ____ ____ | | _\_ |__ _______ ___
3# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
4# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
5# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
6# \/ \/ \/ \/ \/
7# $Id$
8#
9
10include $(ROOTDIR)/lib/microtar/microtar.make
11
12.SECONDEXPANSION:
13
14# FIXME(q1): verify NAND parameters
15$(BUILDDIR)/spl.q1: $(BUILDDIR)/spl.bin
16 $(call PRINTS,MKSPL $(@F))$(TOOLSDIR)/mkspl-x1000 -type=nand -ppb=2 -bpp=2 $< $@
17
18$(BUILDDIR)/bootloader.ucl: $(BUILDDIR)/bootloader.bin
19 $(call PRINTS,UCLPACK $(@F))$(TOOLSDIR)/uclpack --nrv2e -9 $< $@ >/dev/null
20
21.PHONY: $(BUILDDIR)/bootloader-info.txt
22$(BUILDDIR)/bootloader-info.txt:
23 $(call PRINTS,GEN $(@F))echo $(SVNVERSION) > $@
24
25$(BUILDDIR)/$(BINARY): $(BUILDDIR)/spl.q1 \
26 $(BUILDDIR)/bootloader.ucl \
27 $(BUILDDIR)/bootloader-info.txt
28 $(call PRINTS,TAR $(@F))tar -C $(BUILDDIR) \
29 --numeric-owner --no-acls --no-xattrs --no-selinux \
30 --mode=0644 --owner=0 --group=0 \
31 -cf $@ $(call full_path_subst,$(BUILDDIR)/%,%,$^)
diff --git a/firmware/target/mips/ingenic_x1000/x1000boot.make b/firmware/target/mips/ingenic_x1000/x1000boot.make
index e69b6a1439..0bdf5cf7b4 100644
--- a/firmware/target/mips/ingenic_x1000/x1000boot.make
+++ b/firmware/target/mips/ingenic_x1000/x1000boot.make
@@ -7,6 +7,8 @@
7# $Id$ 7# $Id$
8# 8#
9 9
10include $(ROOTDIR)/lib/microtar/microtar.make
11
10INCLUDES += -I$(APPSDIR) 12INCLUDES += -I$(APPSDIR)
11SRC += $(call preprocess, $(APPSDIR)/SOURCES) 13SRC += $(call preprocess, $(APPSDIR)/SOURCES)
12 14
@@ -14,16 +16,23 @@ LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config/$(MODELNAME).h
14 16
15BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds 17BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds
16BOOTLINK := $(BUILDDIR)/boot.link 18BOOTLINK := $(BUILDDIR)/boot.link
19BOOTEXT := $(suffix $(BINARY))
17 20
18SPLLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/spl.lds 21SPLLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/spl.lds
19SPLLINK := $(BUILDDIR)/spl.link 22SPLLINK := $(BUILDDIR)/spl.link
23SPLBINARY := spl$(BOOTEXT)
24
25BLINFO = $(BUILDDIR)/bootloader-info.txt
20 26
21CLEANOBJS += $(BUILDDIR)/bootloader.* $(BUILDDIR)/spl.* 27CLEANOBJS += $(BUILDDIR)/bootloader.* $(BUILDDIR)/spl.*
22 28
23include $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/$(MODELNAME)/boot.make 29# Currently not needed
30#include $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/$(MODELNAME)/boot.make
24 31
25.SECONDEXPANSION: 32.SECONDEXPANSION:
26 33
34### Bootloader
35
27$(BOOTLINK): $(BOOTLDS) $(LDSDEP) 36$(BOOTLINK): $(BOOTLDS) $(LDSDEP)
28 $(call PRINTS,PP $(@F)) 37 $(call PRINTS,PP $(@F))
29 $(call preprocess2file,$<,$@,) 38 $(call preprocess2file,$<,$@,)
@@ -38,6 +47,12 @@ $(BUILDDIR)/bootloader.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(BOOTLINK)
38$(BUILDDIR)/bootloader.bin: $(BUILDDIR)/bootloader.elf 47$(BUILDDIR)/bootloader.bin: $(BUILDDIR)/bootloader.elf
39 $(call PRINTS,OC $(@F))$(call objcopy,$<,$@) 48 $(call PRINTS,OC $(@F))$(call objcopy,$<,$@)
40 49
50$(BUILDDIR)/bootloader.ucl: $(BUILDDIR)/bootloader.bin
51 $(call PRINTS,UCLPACK $(@F))$(TOOLSDIR)/uclpack --nrv2e -9 $< $@ >/dev/null
52
53
54### SPL
55
41$(SPLLINK): $(SPLLDS) $(LDSDEP) 56$(SPLLINK): $(SPLLDS) $(LDSDEP)
42 $(call PRINTS,PP $(@F)) 57 $(call PRINTS,PP $(@F))
43 $(call preprocess2file,$<,$@,) 58 $(call preprocess2file,$<,$@,)
@@ -51,3 +66,29 @@ $(BUILDDIR)/spl.elf: $$(OBJ) $(FIRMLIB) $(CORE_LIBS) $$(SPLLINK)
51 66
52$(BUILDDIR)/spl.bin: $(BUILDDIR)/spl.elf 67$(BUILDDIR)/spl.bin: $(BUILDDIR)/spl.elf
53 $(call PRINTS,OC $(@F))$(call objcopy,$<,$@) 68 $(call PRINTS,OC $(@F))$(call objcopy,$<,$@)
69
70$(BUILDDIR)/$(SPLBINARY): $(BUILDDIR)/spl.bin
71 $(call PRINTS,MKSPL $(@F))$(MKFIRMWARE) $< $@
72
73
74### Generating the update package
75
76# suppress regenerating bootloader-info if nothing has changed
77BLVERSION:=$(SVNVERSION)
78OLDBLVERSION:=$(shell head -n1 $(BLINFO) 2>/dev/null || echo "NOREVISION")
79
80ifneq ($(BLVERSION),$(OLDBLVERSION))
81.PHONY: $(BLINFO)
82endif
83
84$(BLINFO):
85 $(call PRINTS,GEN $(@F))echo $(SVNVERSION) > $@
86
87# The "binary" is actually an update package which is just a tar archive
88$(BUILDDIR)/$(BINARY): $(BUILDDIR)/$(SPLBINARY) \
89 $(BUILDDIR)/bootloader.ucl \
90 $(BLINFO)
91 $(call PRINTS,TAR $(@F))tar -C $(BUILDDIR) \
92 --numeric-owner --no-acls --no-xattrs --no-selinux \
93 --mode=0644 --owner=0 --group=0 \
94 -cf $@ $(call full_path_subst,$(BUILDDIR)/%,%,$^)