[U-Boot] [PATCH 1/2] microblaze: avoid compile error on systems without cfi flash
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error was: board.c: In function 'board_init': board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) board.c:134: error: (Each undeclared identifier is reported only once board.c:134: error: for each function it appears in.)
Signed-off-by: Stephan Linz linz@li-pro.net --- include/configs/microblaze-generic.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 295d123..2ef7d62 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,15 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1
+/* linear flash memory */ +#ifdef XILINX_FLASH_START +#define FLASH +#undef RAMENV /* hold environment in flash */ +#else +#undef FLASH +#define RAMENV /* hold environment in RAM */ +#endif + /* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE @@ -164,9 +173,6 @@ /* stack */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE
-/*#define RAMENV */ -#define FLASH - #ifdef FLASH # define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START # define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE @@ -200,8 +206,6 @@ # define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) -/* hardware flash protection */ -# define CONFIG_SYS_FLASH_PROTECTION #endif /* !FLASH */
/* system ace */
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
Signed-off-by: Stephan Linz linz@li-pro.net --- include/configs/microblaze-generic.h | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 2ef7d62..90f97a1 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -159,14 +159,13 @@ (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE)
/* monitor code */ -#define SIZE 0x40000 -#define CONFIG_SYS_MONITOR_LEN SIZE +#define CONFIG_SYS_MONITOR_LEN 0x40000 #define CONFIG_SYS_MONITOR_BASE \ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \ - CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE) #define CONFIG_SYS_MONITOR_END \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) -#define CONFIG_SYS_MALLOC_LEN SIZE +#define CONFIG_SYS_MALLOC_LEN 0x100000 #define CONFIG_SYS_MALLOC_BASE \ (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
@@ -273,6 +272,8 @@ # define CONFIG_CMD_FLASH # define CONFIG_CMD_IMLS # define CONFIG_CMD_JFFS2 +# define CONFIG_CMD_UBI +# undef CONFIG_CMD_UBIFS
# if !defined(RAMENV) # define CONFIG_CMD_SAVEENV @@ -285,7 +286,21 @@ #endif
#if defined(CONFIG_CMD_JFFS2) -/* JFFS2 partitions */ +# define CONFIG_MTD_PARTITIONS +#endif + +#if defined(CONFIG_CMD_UBIFS) +# define CONFIG_CMD_UBI +# define CONFIG_LZO +#endif + +#if defined(CONFIG_CMD_UBI) +# define CONFIG_MTD_PARTITIONS +# define CONFIG_RBTREE +#endif + +#if defined(CONFIG_MTD_PARTITIONS) +/* MTD partitions */ #define CONFIG_CMD_MTDPARTS /* mtdparts command line support */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_FLASH_CFI_MTD
On 06/21/2012 09:42 PM, Stephan Linz wrote:
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
This say nothing to me. Format is Patch name and when sha1.
Where is this patch? I can't see it in mainline repository?
Thanks, Michal
Dear Michal Simek,
In message 4FE7F154.80406@monstr.eu you wrote:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
This say nothing to me. Format is Patch name and when sha1.
Where is this patch? I can't see it in mainline repository?
Correct. This commit does not exist in mainline.
Best regards,
Wolfgang Denk
Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:
Dear Michal Simek,
In message 4FE7F154.80406@monstr.eu you wrote:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
This say nothing to me. Format is Patch name and when sha1.
Where is this patch? I can't see it in mainline repository?
Correct. This commit does not exist in mainline.
Yes, the commit was newer merged into mainline and lives for more than one year in Microblaze custodian repo:
http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=commitdiff;h=0114da7b06...
br, Stephan
2012/6/25 Stephan Linz linz@li-pro.net:
Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:
Dear Michal Simek,
In message 4FE7F154.80406@monstr.eu you wrote:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
This say nothing to me. Format is Patch name and when sha1.
Where is this patch? I can't see it in mainline repository?
Correct. This commit does not exist in mainline.
Yes, the commit was newer merged into mainline and lives for more than one year in Microblaze custodian repo:
http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=commitdiff;h=0114da7b06...
I have there two branches - master and uboot. uboot follows mainline branch and master contain one your patch which was merged to mainline. That link is correct but it points to nonexisting branch. That patch was definitely there but that branch was delete quite some time ago.
Wolfgang: How to run git-gc on this repository?
I am ok to add this to mainline. Please add that two patches together and resubmit. Also I would prefer to define SYS_MALLOC_LEN based on SIZE. It means for example #define CONFIG_SYS_MALLOC_LEN (SIZE *2) or similar.
Thanks, Michal
Am Dienstag, den 26.06.2012, 10:52 +0200 schrieb Michal Simek:
2012/6/25 Stephan Linz linz@li-pro.net:
Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:
Dear Michal Simek,
In message 4FE7F154.80406@monstr.eu you wrote:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit: 0114da7b06bd47b7f5c3f20a152dd11903b38fba
This say nothing to me. Format is Patch name and when sha1.
Where is this patch? I can't see it in mainline repository?
Correct. This commit does not exist in mainline.
Yes, the commit was newer merged into mainline and lives for more than one year in Microblaze custodian repo:
http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=commitdiff;h=0114da7b06...
I have there two branches - master and uboot. uboot follows mainline branch and master contain one your patch which was merged to mainline. That link is correct but it points to nonexisting branch. That patch was definitely there but that branch was delete quite some time ago.
Yes, it was in the net (?) branch that was deleted sometime.
Wolfgang: How to run git-gc on this repository?
I am ok to add this to mainline. Please add that two patches together and resubmit.
I'll do so (three patches -- see my other comment).
Also I would prefer to define SYS_MALLOC_LEN based on SIZE. It means for example #define CONFIG_SYS_MALLOC_LEN (SIZE *2) or similar.
OK, I'll evaluate the best factor for this multiplication.
br, Stephan
On 06/21/2012 09:42 PM, Stephan Linz wrote:
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error was: board.c: In function 'board_init': board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) board.c:134: error: (Each undeclared identifier is reported only once board.c:134: error: for each function it appears in.)
Signed-off-by: Stephan Linzlinz@li-pro.net
include/configs/microblaze-generic.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 295d123..2ef7d62 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,15 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1
+/* linear flash memory */ +#ifdef XILINX_FLASH_START +#define FLASH +#undef RAMENV /* hold environment in flash */ +#else +#undef FLASH +#define RAMENV /* hold environment in RAM */ +#endif
- /* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE
@@ -164,9 +173,6 @@ /* stack */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE
-/*#define RAMENV */ -#define FLASH
- #ifdef FLASH # define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START # define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE
@@ -200,8 +206,6 @@ # define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) -/* hardware flash protection */ -# define CONFIG_SYS_FLASH_PROTECTION
What's wrong with hardware flash protection?
Thanks, Michal
Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error was: board.c: In function 'board_init': board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) board.c:134: error: (Each undeclared identifier is reported only once board.c:134: error: for each function it appears in.)
Signed-off-by: Stephan Linzlinz@li-pro.net
include/configs/microblaze-generic.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 295d123..2ef7d62 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,15 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1
+/* linear flash memory */ +#ifdef XILINX_FLASH_START +#define FLASH +#undef RAMENV /* hold environment in flash */ +#else +#undef FLASH +#define RAMENV /* hold environment in RAM */ +#endif
- /* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE
@@ -164,9 +173,6 @@ /* stack */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE
-/*#define RAMENV */ -#define FLASH
- #ifdef FLASH # define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START # define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE
@@ -200,8 +206,6 @@ # define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) -/* hardware flash protection */ -# define CONFIG_SYS_FLASH_PROTECTION
What's wrong with hardware flash protection?
Nothing, but it will defined twice. One time in line 182 and one time in that line 204. I think the last one is wrong, because that define is outside the Flash configuration context, or not?
Sorry, I should split the patch. Should I do this?
br, Stephan
2012/6/25 Stephan Linz linz@li-pro.net:
Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error was: board.c: In function 'board_init': board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) board.c:134: error: (Each undeclared identifier is reported only once board.c:134: error: for each function it appears in.)
Signed-off-by: Stephan Linzlinz@li-pro.net
include/configs/microblaze-generic.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 295d123..2ef7d62 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -31,6 +31,15 @@ #define CONFIG_MICROBLAZE 1 #define MICROBLAZE_V5 1
+/* linear flash memory */ +#ifdef XILINX_FLASH_START +#define FLASH +#undef RAMENV /* hold environment in flash */ +#else +#undef FLASH +#define RAMENV /* hold environment in RAM */ +#endif
/* uart */ #ifdef XILINX_UARTLITE_BASEADDR # define CONFIG_XILINX_UARTLITE @@ -164,9 +173,6 @@ /* stack */ #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE
-/*#define RAMENV */ -#define FLASH
#ifdef FLASH # define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START # define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE @@ -200,8 +206,6 @@ # define CONFIG_ENV_IS_NOWHERE 1 # define CONFIG_ENV_SIZE 0x1000 # define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE) -/* hardware flash protection */ -# define CONFIG_SYS_FLASH_PROTECTION
What's wrong with hardware flash protection?
Nothing, but it will defined twice. One time in line 182 and one time in that line 204. I think the last one is wrong, because that define is outside the Flash configuration context, or not?
Sorry, I should split the patch. Should I do this?
Two ways. 1. write it to description 2. create separate patch
Option 2 is IMHO better.
Thanks, Michal
Am Dienstag, den 26.06.2012, 10:56 +0200 schrieb Michal Simek:
2012/6/25 Stephan Linz linz@li-pro.net:
Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:
On 06/21/2012 09:42 PM, Stephan Linz wrote:
Use XILINX_FLASH_START to set/unset FLASH and RAMENV.
Error was: board.c: In function 'board_init': board.c:134: error: 'XILINX_FLASH_START' undeclared (first use in this function) board.c:134: error: (Each undeclared identifier is reported only once board.c:134: error: for each function it appears in.)
Signed-off-by: Stephan Linzlinz@li-pro.net
include/configs/microblaze-generic.h | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
--snip--
What's wrong with hardware flash protection?
Nothing, but it will defined twice. One time in line 182 and one time in that line 204. I think the last one is wrong, because that define is outside the Flash configuration context, or not?
Sorry, I should split the patch. Should I do this?
Two ways.
- write it to description
- create separate patch
Option 2 is IMHO better.
Yes I do so. I'll split the patch and resubmit together with the UBI support patch.
br, Stephan
participants (3)
-
Michal Simek -
Stephan Linz -
Wolfgang Denk