From 4dfb0e4d3e75763d6fbe8788316bea9ba23e8e01 Mon Sep 17 00:00:00 2001 From: DrEagle Date: Sun, 7 Sep 2014 18:01:20 +0200 Subject: ARM: sheevaplug: change env location This patch move the environment offset in sheevaplug. The size of the u-boot binary is become too big. Fix saving environments was result of corrupting the u-boot. Signed-off-by: Gerald Kerma Changes in v2: - patch description Changes in v1: - fix sheevaplug environment offset Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 4747adf..d89bc37 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -54,8 +54,8 @@ * it has to be rounded to sector size */ #define CONFIG_ENV_SIZE 0x20000 /* 128k */ -#define CONFIG_ENV_ADDR 0x60000 -#define CONFIG_ENV_OFFSET 0x60000 /* env starts here */ +#define CONFIG_ENV_ADDR 0x80000 +#define CONFIG_ENV_OFFSET 0x80000 /* env starts here */ /* * Default environment variables -- cgit v0.10.2 From 0f88a5a98eb9d8d5158b074a127a4bf8d4ce8610 Mon Sep 17 00:00:00 2001 From: DrEagle Date: Sun, 7 Sep 2014 18:01:21 +0200 Subject: ARM: sheevaplug: add MVSATA driver This patch add MVSATA driver to sheevaplug Signed-off-by: Gerald Kerma Changes in v1: - add MVSATA driver to sheevaplug - enable ext4 FS support Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index d89bc37..9661b8f 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -1,5 +1,6 @@ /* - * (C) Copyright 2009 + * (C) Copyright 2009-2014 + * Gerald Kerma * Marvell Semiconductor * Written-by: Prafulla Wadaskar * @@ -23,12 +24,21 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* + * Compression configuration + */ +#define CONFIG_BZIP2 +#define CONFIG_LZMA +#define CONFIG_LZO + +/* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #include +#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_DHCP #define CONFIG_CMD_ENV +#define CONFIG_CMD_IDE #define CONFIG_CMD_MII #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND @@ -92,9 +102,23 @@ #endif /* CONFIG_CMD_MMC */ /* + * SATA driver configuration + */ +#ifdef CONFIG_CMD_IDE +#define __io +#define CONFIG_IDE_PREINIT +#define CONFIG_DOS_PARTITION +#define CONFIG_MVSATA_IDE_USE_PORT0 +#define CONFIG_MVSATA_IDE_USE_PORT1 +#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#define CONFIG_SYS_ATA_IDE1_OFFSET MV_SATA_PORT1_OFFSET +#endif /* CONFIG_CMD_IDE */ + +/* * File system */ #define CONFIG_CMD_EXT2 +#define CONFIG_CMD_EXT4 #define CONFIG_CMD_FAT #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_UBI -- cgit v0.10.2 From 65ae9523d9a5868075be40ef2582c75190cee6af Mon Sep 17 00:00:00 2001 From: DrEagle Date: Sun, 7 Sep 2014 18:01:22 +0200 Subject: ARM: sheevaplug: add MTD defaults This patch add MTDIDS and MTDPARTS defaults settings to sheevaplug Signed-off-by: Gerald Kerma Changes in v1: - add MTDIDS and MTDPARTS default to sheevaplug Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 9661b8f..0a3118d 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -83,6 +83,11 @@ "x_bootcmd_usb=usb start\0" \ "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" +#define MTDIDS_DEFAULT "nand0=orion_nand" + +#define MTDPARTS_DEFAULT \ + "mtdparts="CONFIG_MTDPARTS + /* * Ethernet Driver configuration */ -- cgit v0.10.2 From 1e3d64031608d668509b6fe0825f7708bb6b6a0d Mon Sep 17 00:00:00 2001 From: DrEagle Date: Sun, 7 Sep 2014 18:01:23 +0200 Subject: ARM: sheevaplug: redefine MTDPARTS This patch redefine MTDPARTS Signed-off-by: Gerald Kerma Changes in v1: - redefine MTDPARTS Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 0a3118d..62f46b7 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -74,8 +74,10 @@ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ "${x_bootcmd_usb}; bootm 0x6400000;" -#define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \ - "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0" +#define CONFIG_MTDPARTS \ + "mtdparts=orion_nand:512K(uboot)," \ + "512K(env),1M(script),6M(kernel)," \ + "12M(ramdisk),4M(spare),-(rootfs)" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ -- cgit v0.10.2 From 8ca21cbea2671bad315cc93ab636a95d95bac058 Mon Sep 17 00:00:00 2001 From: DrEagle Date: Sun, 7 Sep 2014 18:01:24 +0200 Subject: ARM: sheevaplug: add HUSH parser This patch add HUSH command parser Signed-off-by: Gerald Kerma Changes in v1: - add HUSH command parser Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 62f46b7..71be823 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -31,6 +31,11 @@ #define CONFIG_LZO /* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ + +/* * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ -- cgit v0.10.2 From 45e60c25b54f0443265ee49909c70af90d5cbad9 Mon Sep 17 00:00:00 2001 From: Michael Walle Date: Sun, 28 Sep 2014 00:05:23 +0200 Subject: lsxl: convert to generic board and fix typo Besides converting the LS-XHL and LS-CHLv2 to generic board, fix a typo which accidentally reverted the bootsource to 'hdd' although the default bootsource should be 'legacy'. Cc: Tom Rini Cc: Prafulla Wadaskar Signed-off-by: Michael Walle Signed-off-by: Prafulla Wadaskar diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index bf5c1a1..a14bfe3 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -8,6 +8,8 @@ #ifndef _CONFIG_LSXL_H #define _CONFIG_LSXL_H +#define CONFIG_SYS_GENERIC_BOARD + /* * Version number information */ @@ -157,7 +159,7 @@ "standard_env=setenv ipaddr; setenv netmask; setenv serverip; " \ "setenv ncip; setenv gatewayip; setenv ethact; " \ "setenv bootfile; setenv dnsip; " \ - "setenv bootsource hdd; run ser\0" \ + "setenv bootsource legacy; run ser\0" \ "restore_env=run standard_env; saveenv; reset\0" \ "ser=setenv stdin serial; setenv stdout serial; " \ "setenv stderr serial\0" \ -- cgit v0.10.2