summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZubairLK <ZubairLK@users.noreply.github.com>2015-07-24 12:52:39 +0300
committerZubairLK <ZubairLK@users.noreply.github.com>2015-07-24 12:52:39 +0300
commit040103141210f8e84049d203d0043f2f6b362f6b (patch)
tree5ea2c76ca843bb005ba4a9dbc573e74c452ac545
parent33c8075d019902d411f974f3d85b085732adfa7b (diff)
parent4a60c4d061cc2c04f7f1e916a53c632aa98d9919 (diff)
downloadCI20_u-boot-040103141210f8e84049d203d0043f2f6b362f6b.tar.xz
Merge pull request #6 from aejsmith/ci20-v2013.10-bootargs
Update default configuration for 3.18
-rw-r--r--drivers/mtd/nand/nand_base.c2
-rw-r--r--drivers/mtd/nand/nand_bbt.c5
-rw-r--r--include/configs/ci20.h20
3 files changed, 16 insertions, 11 deletions
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index d4d586c94..7fc4e46da 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3387,6 +3387,8 @@ int nand_scan_tail(struct mtd_info *mtd)
if (chip->options & NAND_SKIP_BBTSCAN)
chip->options |= NAND_BBT_SCANNED;
+ chip->options |= NAND_BBT_SCANNED;
+ chip->scan_bbt(mtd);
return 0;
}
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 8ef58451d..2d4530c62 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -438,7 +438,7 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,
if (ret && !mtd_is_bitflip_or_eccerr(ret))
return ret;
- if (check_short_pattern(buf, bd))
+ if (!check_short_pattern(buf, bd))
return 1;
offs += mtd->writesize;
@@ -1233,6 +1233,7 @@ int nand_update_bbt(struct mtd_info *mtd, loff_t offs)
* while scanning a device for factory marked good / bad blocks.
*/
static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+static uint8_t scan_00_pattern[] = { 0x00, 0x00 };
static uint8_t scan_agand_pattern[] = { 0x1C, 0x71, 0xC7, 0x1C, 0x71, 0xC7 };
@@ -1310,7 +1311,7 @@ static int nand_create_badblock_pattern(struct nand_chip *this)
bd->options = this->bbt_options & BADBLOCK_SCAN_MASK;
bd->offs = this->badblockpos;
bd->len = (this->options & NAND_BUSWIDTH_16) ? 2 : 1;
- bd->pattern = scan_ff_pattern;
+ bd->pattern = scan_00_pattern;
bd->options |= NAND_BBT_DYNAMICSTRUCT;
this->badblock_pattern = bd;
return 0;
diff --git a/include/configs/ci20.h b/include/configs/ci20.h
index f4337c02a..ee808ce1b 100644
--- a/include/configs/ci20.h
+++ b/include/configs/ci20.h
@@ -43,7 +43,7 @@
#define CONFIG_SYS_AUDIO_SPEED (768 * 1000000)
/* define this if you require JTAG support */
-#undef CONFIG_JTAG
+#define CONFIG_JTAG
/* NS16550-ish UARTs, uart[0134] are accessible */
#define CONFIG_SYS_NS16550
@@ -56,7 +56,7 @@
#define CONFIG_SYS_NS16550_COM5 0xb0034000 /* uart4 */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_CONSOLE_MUX
-#define CONFIG_CONS_INDEX 1
+#define CONFIG_CONS_INDEX 5
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE \
{ 300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200, 230400 }
@@ -74,33 +74,35 @@
#define CONFIG_BOOTDELAY 2
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
-#define BOOTARGS_COMMON "console=ttyS0,115200 console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000"
+#define BOOTARGS_COMMON \
+ "console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait"
#ifdef CONFIG_SPL_MMC_SUPPORT
/* SD/MMC card defaults */
#define CONFIG_BOOTARGS \
- BOOTARGS_COMMON " root=/dev/mmcblk0p1"
+ BOOTARGS_COMMON " root=/dev/mmcblk0p1"
#define CONFIG_BOOTCOMMAND \
- "ext4load mmc 0:1 0x88000000 /boot/vmlinux.img; bootm 0x88000000"
+ "run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000"
#else /* !CONFIG_SPL_MMC_SUPPORT */
/* NAND defaults */
#define CONFIG_BOOTARGS \
- BOOTARGS_COMMON " ubi.mtd=1 root=ubi0:root rootfstype=ubifs rw"
+ BOOTARGS_COMMON " ubi.mtd=3 root=ubi0:root rootfstype=ubifs rw"
#define CONFIG_BOOTCOMMAND \
- "mtdparts default; ubi part system; ubifsmount ubi:boot; " \
- "ubifsload 0x88000000 vmlinux.img; bootm 0x88000000"
+ "run ethargs; mtdparts default; ubi part system; ubifsmount ubi:boot; " \
+ "ubifsload 0x88000000 uImage; bootm 0x88000000"
#endif /* !CONFIG_SPL_MMC_SUPPORT */
#define CONFIG_EXTRA_ENV_SETTINGS \
"stdin=eserial0,eserial4\0" \
"stdout=eserial0,eserial4\0" \
- "stderr=eserial0,eserial4\0"
+ "stderr=eserial0,eserial4\0" \
+ "ethargs=env set bootargs ${bootargs} dm9000.mac_addr=${ethaddr}\0"
#define CONFIG_SYS_HUSH_PARSER