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-a5462d6192.tar.gz rockbox-a5462d6192.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 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" -/* Define EROSQN_VER as a GCC option if desired - +/* Define EROSQN_VER as an "extradefine" in the configure script - * v1, v2 players: "1" * v3 players: "3" - * Only bootloader will be affected + * Only bootloader will be affected. + * + * This allows us to fix the LCD init issues with v3 players. */ -#ifdef BOOTLOADER -# ifndef EROSQN_VER /* this should probably go in config/erosqnative.h*/ -# define EROSQN_VER 1 -# endif +#ifndef EROSQN_VER +#error "Must define EROSQN_VER" #endif /* 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 INCLUDES += -I$(APPSDIR) SRC += $(call preprocess, $(APPSDIR)/SOURCES) -LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config/$(MODELNAME).h +LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config.h BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds 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 t_model="erosqnative" # player version, for bootloader usage # versions 1 and 2 both use 1 - GCCOPTS="$GCCOPTS -DEROSQN_VER=1" + extradefines="$extradefines -DEROSQN_VER=1" ;; 248|erosqnative_v3) - target_id=116 - modelname="erosqnative" + target_id=117 + modelname="erosqnative_v3" target="EROS_QN" memory=32 mipsr2elcc @@ -4221,7 +4221,7 @@ fi t_model="erosqnative" # player version, for bootloader usage # version 3 - GCCOPTS="$GCCOPTS -DEROSQN_VER=3" + extradefines="$extradefines -DEROSQN_VER=3" ;; |