diff options
| author | Tom Rini <trini@konsulko.com> | 2016-03-25 12:57:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-03-25 12:57:18 -0400 |
| commit | a6164205ee933fa956d9f07f4ae08b39b64629e7 (patch) | |
| tree | f69f88b79602a47527409b83aa0c30091362f95b /include/configs | |
| parent | b5b84be8a7356d4c3618b6edcb501885e53569f5 (diff) | |
| parent | 7497a6a1f13eb86d68a936edecfd682bbad5752d (diff) | |
| download | blackbird-obmc-uboot-a6164205ee933fa956d9f07f4ae08b39b64629e7.tar.gz blackbird-obmc-uboot-a6164205ee933fa956d9f07f4ae08b39b64629e7.zip | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/sheevaplug.h | 6 | ||||
| -rw-r--r-- | include/configs/theadorable.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index c529636a66..f9fb9bc9af 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -64,12 +64,12 @@ #define CONFIG_MTDPARTS \ "orion_nand:512K(uboot)," \ - "512K(env),1M(script),6M(kernel)," \ - "12M(ramdisk),4M(spare),-(rootfs)\0" + "512K(env),4M(kernel)," \ + "-(rootfs)\0" #define CONFIG_EXTRA_ENV_SETTINGS "x_bootargs=console" \ "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS \ - "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \ + "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x400000\0" \ "x_bootcmd_usb=usb start\0" \ "x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0" diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 9f186add71..a4bcf21210 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -114,6 +114,11 @@ #define CONFIG_VGA_AS_SINGLE_DEVICE #define CONFIG_CMD_BMP +/* FPGA programming support */ +#define CONFIG_FPGA +#define CONFIG_FPGA_ALTERA +#define CONFIG_FPGA_STRATIX_V + /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros |
