diff options
author | Dana Conrad <dconrad@fastmail.com> | 2024-09-02 19:27:59 +0000 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-09-08 12:29:03 -0400 |
commit | a5462d6192909dd0abbae15b19d634ca1c0ed4a2 (patch) | |
tree | e3eea9c437dfe0385545ce71f6cba5a21f03cea5 | |
parent | a86e2b5c6e2202827004755358db1dac0fde5540 (diff) | |
download | rockbox-a5462d6192909dd0abbae15b19d634ca1c0ed4a2.tar.gz rockbox-a5462d6192909dd0abbae15b19d634ca1c0ed4a2.zip |
erosqnative: Give erosqnative_v3 its own target ID and modelname
This is needed so "make clean; make reconf" will work correctly.
Change-Id: Ife13e59ac6054f04f7095aa2263ec64595eeb3a2
-rw-r--r-- | firmware/export/config/erosqnative.h | 12 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_x1000/x1000boot.make | 2 | ||||
-rwxr-xr-x | tools/configure | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h index 5eb9ba7021..357be1c280 100644 --- a/firmware/export/config/erosqnative.h +++ b/firmware/export/config/erosqnative.h | |||
@@ -9,15 +9,15 @@ | |||
9 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 9 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
10 | #define BOOTDIR "/.rockbox" | 10 | #define BOOTDIR "/.rockbox" |
11 | 11 | ||
12 | /* Define EROSQN_VER as a GCC option if desired - | 12 | /* Define EROSQN_VER as an "extradefine" in the configure script - |
13 | * v1, v2 players: "1" | 13 | * v1, v2 players: "1" |
14 | * v3 players: "3" | 14 | * v3 players: "3" |
15 | * Only bootloader will be affected | 15 | * Only bootloader will be affected. |
16 | * | ||
17 | * This allows us to fix the LCD init issues with v3 players. | ||
16 | */ | 18 | */ |
17 | #ifdef BOOTLOADER | 19 | #ifndef EROSQN_VER |
18 | # ifndef EROSQN_VER /* this should probably go in config/erosqnative.h*/ | 20 | #error "Must define EROSQN_VER" |
19 | # define EROSQN_VER 1 | ||
20 | # endif | ||
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | /* CPU defines */ | 23 | /* CPU defines */ |
diff --git a/firmware/target/mips/ingenic_x1000/x1000boot.make b/firmware/target/mips/ingenic_x1000/x1000boot.make index 0bdf5cf7b4..7a861b0a3d 100644 --- a/firmware/target/mips/ingenic_x1000/x1000boot.make +++ b/firmware/target/mips/ingenic_x1000/x1000boot.make | |||
@@ -12,7 +12,7 @@ include $(ROOTDIR)/lib/microtar/microtar.make | |||
12 | INCLUDES += -I$(APPSDIR) | 12 | INCLUDES += -I$(APPSDIR) |
13 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) | 13 | SRC += $(call preprocess, $(APPSDIR)/SOURCES) |
14 | 14 | ||
15 | LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config/$(MODELNAME).h | 15 | LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config.h |
16 | 16 | ||
17 | BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds | 17 | BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds |
18 | BOOTLINK := $(BUILDDIR)/boot.link | 18 | BOOTLINK := $(BUILDDIR)/boot.link |
diff --git a/tools/configure b/tools/configure index d6812cd4c4..43f119ae17 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -4194,12 +4194,12 @@ fi | |||
4194 | t_model="erosqnative" | 4194 | t_model="erosqnative" |
4195 | # player version, for bootloader usage | 4195 | # player version, for bootloader usage |
4196 | # versions 1 and 2 both use 1 | 4196 | # versions 1 and 2 both use 1 |
4197 | GCCOPTS="$GCCOPTS -DEROSQN_VER=1" | 4197 | extradefines="$extradefines -DEROSQN_VER=1" |
4198 | ;; | 4198 | ;; |
4199 | 4199 | ||
4200 | 248|erosqnative_v3) | 4200 | 248|erosqnative_v3) |
4201 | target_id=116 | 4201 | target_id=117 |
4202 | modelname="erosqnative" | 4202 | modelname="erosqnative_v3" |
4203 | target="EROS_QN" | 4203 | target="EROS_QN" |
4204 | memory=32 | 4204 | memory=32 |
4205 | mipsr2elcc | 4205 | mipsr2elcc |
@@ -4221,7 +4221,7 @@ fi | |||
4221 | t_model="erosqnative" | 4221 | t_model="erosqnative" |
4222 | # player version, for bootloader usage | 4222 | # player version, for bootloader usage |
4223 | # version 3 | 4223 | # version 3 |
4224 | GCCOPTS="$GCCOPTS -DEROSQN_VER=3" | 4224 | extradefines="$extradefines -DEROSQN_VER=3" |
4225 | ;; | 4225 | ;; |
4226 | 4226 | ||
4227 | 4227 | ||