microblaze: avoid compile error on systems without cfi flash

PATCH New Stephan Linz 3 participants 11 messages Jun 21, 2012 – Jun 26, 2012

lore

Share & tools

lore

Stephan Linz

author

2012-06-21 19:42 UTC #0 lore raw

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 <[email protected]>

---
 include/configs/microblaze-generic.h |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

include/configs/microblaze-generic.h +9 -5

index 295d123..2ef7d62 100644
@@ -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 */

Signature · 1 line

1.7.0.4

Stephan Linz

author

2012-06-21 19:42 UTC #1 lore raw

PATCH 2/2 microblaze: Enable ubi support

To save memory the UBIFS is disabled by default.

The original patch was introdused with commit:
0114da7b06bd47b7f5c3f20a152dd11903b38fba

Signed-off-by Stephan Linz <[email protected]>

---
 include/configs/microblaze-generic.h |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

include/configs/microblaze-generic.h +19 -4

index 2ef7d62..90f97a1 100644
@@ -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

Signature · 1 line

1.7.0.4

Michal Simek

2012-06-25 05:04 UTC #2 lore raw

PATCH 2/2 microblaze: Enable ubi support

Quoted 4 lines · Stephan Linz

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

Signature · 4 lines

Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

Wolfgang Denk

2012-06-25 07:22 UTC #3 lore raw

PATCH 2/2 microblaze: Enable ubi support

Dear Michal Simek,

Quoted 10 lines · In message <[email protected]> you wrote:

Quoted 4 lines · Stephan Linz
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

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"A complex system that works is invariably found to have evolved from
a simple system that worked."             - John Gall, _Systemantics_

Stephan Linz

author

2012-06-25 17:08 UTC #4 lore raw

PATCH 2/2 microblaze: Enable ubi support

Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:

Quoted 9 lines

Dear Michal Simek,
Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 4 lines · Stephan Linz
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit:
0114da7b06bd47b7f5c3f20a152dd11903b38fba

Quoted 6 lines

Quoted 4 lines
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=0114da7b06bd47b7f5c3f20a152dd11903b38fba

br,
Stephan

Michal Simek

2012-06-26 08:52 UTC #5 lore raw

PATCH 2/2 microblaze: Enable ubi support

2012/6/25 Stephan Linz <[email protected]>:

Quoted 13 lines

Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:
Quoted 12 lines
Dear Michal Simek,
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 4 lines · Stephan Linz
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.

Quoted 8 lines

Quoted 3 lines
Quoted 1 line
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=0114da7b06bd47b7f5c3f20a152dd11903b38fba

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

Stephan Linz

author

2012-06-26 16:56 UTC #6 lore raw

PATCH 2/2 microblaze: Enable ubi support

Am Dienstag, den 26.06.2012, 10:52 +0200 schrieb Michal Simek:

Quoted 21 lines

2012/6/25 Stephan Linz <[email protected]>:
Quoted 20 lines
Am Montag, den 25.06.2012, 09:22 +0200 schrieb Wolfgang Denk:
Quoted 9 lines
Dear Michal Simek,
Quoted 6 lines · In message <[email protected]> you wrote:
Quoted 4 lines · Stephan Linz
To save memory the UBIFS is disabled by default.
The original patch was introdused with commit:
0114da7b06bd47b7f5c3f20a152dd11903b38fba
Quoted 6 lines
Quoted 4 lines
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:

Quoted 7 lines

Quoted 1 line
http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=commitdiff;h=0114da7b06bd47b7f5c3f20a152dd11903b38fba
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.

Quoted 5 lines

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).

Quoted 4 lines

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

Michal Simek

2012-06-25 04:55 UTC #7 lore raw

PATCH 1/2 microblaze: avoid compile error on systems without cfi flash

In reply to Stephan Linz

Quoted 44 lines · Stephan Linz

Use XILINX_FLASH_START to set/unset FLASH and RAMENV.

Signed-off-by Stephan Linz<[email protected]>

---
  include/configs/microblaze-generic.h |   14 +++++++++-----
  1 files changed, 9 insertions(+), 5 deletions(-)

include/configs/microblaze-generic.h +9 -3

index 295d123..2ef7d62 100644
@@ -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

include/configs/microblaze-generic.h line 204

Quoted 5 lines

include/configs/microblaze-generic.h +0 -2

@@ -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

Signature · 4 lines

Michal Simek, Ing. (M.Eng)
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian

Stephan Linz

author

2012-06-25 17:08 UTC #8 lore raw

PATCH 1/2 microblaze: avoid compile error on systems without cfi flash

Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:

Quoted 38 lines · Stephan Linz

Quoted 37 lines
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<[email protected]>
---
  include/configs/microblaze-generic.h |   14 +++++++++-----
  1 files changed, 9 insertions(+), 5 deletions(-)
include/configs/microblaze-generic.h +9 -0
index 295d123..2ef7d62 100644
@@ -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
 

Quoted 14 lines

include/configs/microblaze-generic.h line 204

Quoted 12 lines

include/configs/microblaze-generic.h +0 -5

-/*#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

Michal Simek

2012-06-26 08:56 UTC #9 lore raw

PATCH 1/2 microblaze: avoid compile error on systems without cfi flash

2012/6/25 Stephan Linz <[email protected]>:

Quoted 54 lines

Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:
Quoted 38 lines · Stephan Linz
Quoted 37 lines
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<[email protected]>
---
? include/configs/microblaze-generic.h | ? 14 +++++++++----- ? 1 files changed, 9 insertions(+), 5 deletions(-)
include/configs/microblaze-generic.h +0 -0
index 295d123..2ef7d62 100644
@@ -31,6 +31,15 @@
? #define ? CONFIG_MICROBLAZE ? ? ? 1
? #define ? MICROBLAZE_V5 ? ? ? ? ? 1
include/configs/microblaze-generic.h +9 -0
+/* 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
include/configs/microblaze-generic.h +0 -0
@@ -164,9 +173,6 @@
? /* stack */
? #define ? CONFIG_SYS_INIT_SP_OFFSET ? ? ? CONFIG_SYS_MALLOC_BASE
Quoted 14 lines
include/configs/microblaze-generic.h line 204
Quoted 12 lines
include/configs/microblaze-generic.h +0 -3
-/*#define ?RAMENV */
-#define ? ?FLASH
-
? #ifdef FLASH
? # define CONFIG_SYS_FLASH_BASE ? ? ? ? ? ?XILINX_FLASH_START ? # define CONFIG_SYS_FLASH_SIZE ? ? ? ? ? ?XILINX_FLASH_SIZE
include/configs/microblaze-generic.h +0 -0
@@ -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)
include/configs/microblaze-generic.h +0 -2
-/* hardware flash protection */
-# define CONFIG_SYS_FLASH_PROTECTION
What's wrong with hardware flash protection?

Quoted 5 lines

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

Stephan Linz

author

2012-06-26 16:56 UTC #10 lore raw

PATCH 1/2 microblaze: avoid compile error on systems without cfi flash

Am Dienstag, den 26.06.2012, 10:56 +0200 schrieb Michal Simek:

Quoted 24 lines

2012/6/25 Stephan Linz <[email protected]>:
Quoted 23 lines
Am Montag, den 25.06.2012, 06:55 +0200 schrieb Michal Simek:
Quoted 9 lines · Stephan Linz
Quoted 8 lines
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.)
Quoted 8 lines
Quoted 6 lines
Signed-off-by Stephan Linz<[email protected]>
---
  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?

Quoted 7 lines

Quoted 1 line
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.

Yes I do so. I'll split the patch and resubmit together with the UBI support patch.

br,
Stephan