* [U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement
@ 2013-08-19 9:55 Jens Scharsig
2013-08-21 15:22 ` Andreas Bießmann
0 siblings, 1 reply; 3+ messages in thread
From: Jens Scharsig @ 2013-08-19 9:55 UTC (permalink / raw)
To: u-boot
From: "Jens Scharsig (BuS Elektronik)" <esw@bus-elektronik.de>
- remove jffs2 support, board doesn't use this anymore
- add ubifs support
- change sizes and start for partitions
Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
---
sorry about this fast V2. localversion-eb_cpux9k2 are now removed from patch
include/configs/eb_cpux9k2.h | 61 ++++++++++++++++++++++----------------------
localversion-eb_cpux9k2 | 2 +-
2 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index 0d07ac4..b35f2c7 100644
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -140,41 +140,40 @@
#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_I2C
-#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
#define CONFIG_CMD_PING
-#define CONFIG_I2C_CMD_NO_FLAT
#define CONFIG_I2C_CMD_TREE
#define CONFIG_CMD_USB
#define CONFIG_CMD_FAT
-
+#define CONFIG_CMD_UBI
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_CMD_UBIFS
#define CONFIG_SYS_LONGHELP
/*
- * Filesystems
+ * MTD defines
*/
-#define CONFIG_JFFS2_NAND 1
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_RBTREE
+#define CONFIG_LZO
-#ifndef CONFIG_JFFS2_CMDLINE
-#define CONFIG_JFFS2_DEV "nand0"
-#define CONFIG_JFFS2_PART_OFFSET 0
-#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF
-#else
-#define MTDIDS_DEFAULT "nor0=0,nand0=1"
+#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=atmel_nand"
#define MTDPARTS_DEFAULT "mtdparts=" \
- "0:" \
- "384k(U-Boot)," \
- "128k(Env)," \
- "128k(Splash)," \
- "4M(Kernel)," \
- "-(FS)" \
+ "physmap-flash.0:" \
+ "512k(U-Boot)," \
+ "128k(Env)," \
+ "128k(Splash)," \
+ "4M(Kernel)," \
+ "384k(MiniFS)," \
+ "-(FS)" \
";" \
- "1:" \
- "-(jffs2)"
-#endif /* CONFIG_JFFS2_CMDLINE */
-
+ "atmel_nand:" \
+ "1M(emergency)," \
+ "-(data)"
/*
* Hardware drivers
*/
@@ -348,7 +347,7 @@
#define CONFIG_BOOTDELAY 5
#define CONFIG_ENV_IS_IN_FLASH 1
-#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x60000)
+#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x80000)
#define CONFIG_ENV_SIZE 0x20000 /* sectors are 128K here */
#define CONFIG_BAUDRATE 115200
@@ -367,12 +366,14 @@
"displayheight=512\0" \
"displaybsteps=1023\0" \
"ubootaddr=10000000\0" \
- "splashimage=10080000\0" \
- "kerneladdr=100A0000\0" \
+ "splashimage=100A0000\0" \
+ "kerneladdr=100C0000\0" \
"kernelsize=00400000\0" \
- "rootfsaddr=10500000\0" \
+ "rootfsaddr=10520000\0" \
"copy_addr=21200000\0" \
- "rootfssize=00B00000\0" \
+ "rootfssize=00AE0000\0" \
+ "mtdids=" MTDIDS_DEFAULT "\0" \
+ "mtdparts=" MTDPARTS_DEFAULT "\0" \
"bootargsdefaults=set bootargs " \
"console=ttyS0,115200 " \
"video=vcxk_fb:xres:${displaywidth}," \
@@ -393,15 +394,15 @@
"erase $(rootfsaddr) +$(rootfssize);" \
"cp.b $(fileaddr) $(rootfsaddr) $(filesize);" \
"\0" \
- "update_uboot=protect off 10000000 1005FFFF;" \
+ "update_uboot=protect off 10000000 1007FFFF;" \
"dhcp $(copy_addr) u-boot_eb_cpux9k2;" \
- "erase 10000000 1005FFFF;" \
+ "erase 10000000 1007FFFF;" \
"cp.b $(fileaddr) $(ubootaddr) $(filesize);" \
- "protect on 10000000 1005FFFF;reset\0" \
+ "protect on 10000000 1007FFFF;reset\0" \
"update_splash=protect off $(splashimage) +20000;" \
"dhcp $(copy_addr) splash_eb_cpux9k2.bmp;" \
"erase $(splashimage) +20000;" \
- "cp.b $(fileaddr) 10080000 $(filesize);" \
+ "cp.b $(fileaddr) $(splashimage) $(filesize);" \
"protect on $(splashimage) +20000;reset\0" \
"emergency=run bootargsdefaults;" \
"set bootargs $(bootargs) root=initramfs boot=emergency " \
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement
2013-08-19 9:55 [U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement Jens Scharsig
@ 2013-08-21 15:22 ` Andreas Bießmann
2013-08-22 6:12 ` esw at bus-elektronik.de
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Bießmann @ 2013-08-21 15:22 UTC (permalink / raw)
To: u-boot
Hi Jens,
On 08/19/2013 11:55 AM, Jens Scharsig (BuS Elektronik) wrote:
> From: "Jens Scharsig (BuS Elektronik)" <esw@bus-elektronik.de>
>
> - remove jffs2 support, board doesn't use this anymore
> - add ubifs support
> - change sizes and start for partitions
>
> Signed-off-by: Jens Scharsig (BuS Elektronik) <esw@bus-elektronik.de>
>
> ---
>
> sorry about this fast V2. localversion-eb_cpux9k2 are now removed from patch
no problem ;)
> include/configs/eb_cpux9k2.h | 61 ++++++++++++++++++++++----------------------
> localversion-eb_cpux9k2 | 2 +-
> 2 files changed, 32 insertions(+), 31 deletions(-)
>
<snip>
> @@ -367,12 +366,14 @@
> "displayheight=512\0" \
> "displaybsteps=1023\0" \
> "ubootaddr=10000000\0" \
> - "splashimage=10080000\0" \
> - "kerneladdr=100A0000\0" \
> + "splashimage=100A0000\0" \
> + "kerneladdr=100C0000\0" \
> "kernelsize=00400000\0" \
> - "rootfsaddr=10500000\0" \
> + "rootfsaddr=10520000\0" \
> "copy_addr=21200000\0" \
> - "rootfssize=00B00000\0" \
> + "rootfssize=00AE0000\0" \
> + "mtdids=" MTDIDS_DEFAULT "\0" \
> + "mtdparts=" MTDPARTS_DEFAULT "\0" \
> "bootargsdefaults=set bootargs " \
> "console=ttyS0,115200 " \
> "video=vcxk_fb:xres:${displaywidth}," \
sorry, but this hunk doesn't apply cleanly on top of current
u-boot-atmel/master, could you please rebase?
Best regards,
Andreas Bie?mann
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement
2013-08-21 15:22 ` Andreas Bießmann
@ 2013-08-22 6:12 ` esw at bus-elektronik.de
0 siblings, 0 replies; 3+ messages in thread
From: esw at bus-elektronik.de @ 2013-08-22 6:12 UTC (permalink / raw)
To: u-boot
Deer Andreas,
>
> sorry, but this hunk doesn't apply cleanly on top of current
> u-boot-atmel/master, could you please rebase?
I will send a V3
Best regards
Jens Scharsig
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-22 6:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-19 9:55 [U-Boot] [PATCH V2] arm: atmel: cpux9k2: board update and enhancement Jens Scharsig
2013-08-21 15:22 ` Andreas Bießmann
2013-08-22 6:12 ` esw at bus-elektronik.de
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox