From 7e31f2a6d5ff736276b628e7cc826ba577f1209c Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 19 Jan 2026 13:11:14 +0000 Subject: [PATCH] imx233: move SoC-specific config symbols to separate header Change-Id: Id044c59045712f1b96b93b5a93b07ddaa46bab7c --- firmware/export/config.h | 11 ----------- firmware/export/config/creativezen.h | 3 +++ firmware/export/config/creativezenmozaic.h | 3 +++ firmware/export/config/creativezenv.h | 3 +++ firmware/export/config/creativezenxfi.h | 3 +++ firmware/export/config/creativezenxfi2.h | 3 +++ firmware/export/config/creativezenxfi3.h | 3 +++ firmware/export/config/creativezenxfistyle.h | 3 +++ firmware/export/config/sansafuzeplus.h | 3 +++ firmware/export/config/sonynwze360.h | 3 +++ firmware/export/config/sonynwze370.h | 3 +++ firmware/target/arm/imx233/imx233-config.h | 14 ++++++++++++++ 12 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 firmware/target/arm/imx233/imx233-config.h diff --git a/firmware/export/config.h b/firmware/export/config.h index f9a2ca26ea..b89cab6bbd 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -386,17 +386,6 @@ Lyre prototype 1 */ #define CPU 0 #define COP 1 -/* imx233 specific: IMX233_PACKAGE */ -#define IMX233_BGA100 0 -#define IMX233_BGA169 1 -#define IMX233_TQFP100 2 -#define IMX233_TQFP128 3 -#define IMX233_LQFP100 4 - -/* IMX233_PARTITIONS */ -#define IMX233_FREESCALE (1 << 0) /* Freescale I.MX233 nonstandard two-level MBR */ -#define IMX233_CREATIVE (1 << 1) /* Creative MBLK windowing */ - /* CONFIG_BUFLIB_BACKEND */ #define BUFLIB_BACKEND_MEMPOOL 0 /* Default memory pool backed buflib */ #define BUFLIB_BACKEND_MALLOC 1 /* malloc() buflib (for debugging) */ diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index e1a12e4d1e..df21913982 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative Zen */ diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index dd7a6a5c2e..606c6344d1 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative ZEN Mozaic */ diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h index 8b2c1ef88b..c615f029c9 100644 --- a/firmware/export/config/creativezenv.h +++ b/firmware/export/config/creativezenv.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative ZEN V */ diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index dd4d0a9eba..70b8b9690a 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative Zen X-Fi */ diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 6ef9d28d94..7857224daf 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative Zen X-Fi2 */ diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index aa01e9ebbc..33ae48d8ed 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative Zen X-Fi3 */ diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h index 40b7b9a683..f68d5c7fec 100644 --- a/firmware/export/config/creativezenxfistyle.h +++ b/firmware/export/config/creativezenxfistyle.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Creative Zen X-Fi Style */ diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index ea134140eb..190d5a61b8 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Sandisk Sansa Fuze+ */ diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h index 548486ae5b..1dd02fc1dd 100644 --- a/firmware/export/config/sonynwze360.h +++ b/firmware/export/config/sonynwze360.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Sony NWZ-E360 series */ diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h index d086bf0944..4ee8b1b1dc 100644 --- a/firmware/export/config/sonynwze370.h +++ b/firmware/export/config/sonynwze370.h @@ -1,3 +1,6 @@ +/* Pull in SoC-specific defines */ +#include "imx233-config.h" + /* * This config file is for the Sony NWZ-E370/E380 series */ diff --git a/firmware/target/arm/imx233/imx233-config.h b/firmware/target/arm/imx233/imx233-config.h new file mode 100644 index 0000000000..9efb36421c --- /dev/null +++ b/firmware/target/arm/imx233/imx233-config.h @@ -0,0 +1,14 @@ +/* + * To be included by config/TARGET.h + */ + +/* IMX233_PACKAGE */ +#define IMX233_BGA100 0 +#define IMX233_BGA169 1 +#define IMX233_TQFP100 2 +#define IMX233_TQFP128 3 +#define IMX233_LQFP100 4 + +/* IMX233_PARTITIONS */ +#define IMX233_FREESCALE (1 << 0) /* Freescale I.MX233 nonstandard two-level MBR */ +#define IMX233_CREATIVE (1 << 1) /* Creative MBLK windowing */