* [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION
@ 2012-06-26 22:28 Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 2/3] microblaze: avoid compile error on systems without cfi flash Stephan Linz
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Stephan Linz @ 2012-06-26 22:28 UTC (permalink / raw)
To: u-boot
CONFIG_SYS_FLASH_PROTECTION will defined twice. The second one
is outside the flash configuration context and we can remove
it safely.
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
include/configs/microblaze-generic.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 295d123..5f16820 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -200,8 +200,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 */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/3] microblaze: avoid compile error on systems without cfi flash
2012-06-26 22:28 [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Stephan Linz
@ 2012-06-26 22:28 ` Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 3/3] microblaze: Enable ubi support Stephan Linz
2012-06-27 8:32 ` [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Michal Simek
2 siblings, 0 replies; 4+ messages in thread
From: Stephan Linz @ 2012-06-26 22:28 UTC (permalink / raw)
To: u-boot
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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 5f16820..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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 3/3] microblaze: Enable ubi support
2012-06-26 22:28 [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 2/3] microblaze: avoid compile error on systems without cfi flash Stephan Linz
@ 2012-06-26 22:28 ` Stephan Linz
2012-06-27 8:32 ` [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Michal Simek
2 siblings, 0 replies; 4+ messages in thread
From: Stephan Linz @ 2012-06-26 22:28 UTC (permalink / raw)
To: u-boot
Increase malloc area for UBI to >= 512k -- foreseeing of UBIFS
set to 768k. To save memory in flash (CONFIG_SYS_MONITOR_LEN)
the UBIFS is disabled by default.
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
include/configs/microblaze-generic.h | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 2ef7d62..2fd2279 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -166,7 +166,7 @@
- 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 (SIZE * 3)
#define CONFIG_SYS_MALLOC_BASE \
(CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
@@ -273,6 +273,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 +287,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
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION
2012-06-26 22:28 [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 2/3] microblaze: avoid compile error on systems without cfi flash Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 3/3] microblaze: Enable ubi support Stephan Linz
@ 2012-06-27 8:32 ` Michal Simek
2 siblings, 0 replies; 4+ messages in thread
From: Michal Simek @ 2012-06-27 8:32 UTC (permalink / raw)
To: u-boot
On 06/27/2012 12:28 AM, Stephan Linz wrote:
> CONFIG_SYS_FLASH_PROTECTION will defined twice. The second one
> is outside the flash configuration context and we can remove
> it safely.
>
> Signed-off-by: Stephan Linz<linz@li-pro.net>
> ---
> include/configs/microblaze-generic.h | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 295d123..5f16820 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -200,8 +200,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 */
Applied all three patches to microblaze custodian repo with minor cleanup.
Thanks,
Michal
--
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-06-27 8:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-26 22:28 [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 2/3] microblaze: avoid compile error on systems without cfi flash Stephan Linz
2012-06-26 22:28 ` [U-Boot] [PATCH 3/3] microblaze: Enable ubi support Stephan Linz
2012-06-27 8:32 ` [U-Boot] [PATCH 1/3] microblaze: remove wrong define CONFIG_SYS_FLASH_PROTECTION Michal Simek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.