diff options
| author | Tom Rini <trini@konsulko.com> | 2016-01-14 21:51:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-01-14 21:51:32 -0500 |
| commit | 4edde96111aefac63d6aaca6ba87a90d149e973e (patch) | |
| tree | 83996996fc15554644c114e4f4d534d78cef15fd /include | |
| parent | a737028e80603f49a4757adec10b5842d0689dbb (diff) | |
| parent | 5c2ed61ce235fd835a3f594bc983dfc20959568c (diff) | |
| download | blackbird-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.tar.gz blackbird-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/x86-common.h | 3 | ||||
| -rw-r--r-- | include/fdtdec.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 70ec1032fd..4182a3bf63 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -208,6 +208,7 @@ #define CONFIG_HOSTNAME x86 #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 +#define CONFIG_RAMDISK_ADDR 0x4000000 #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ @@ -215,7 +216,7 @@ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "othbootargs=acpi=off\0" \ - "ramdiskaddr=0x2000000\0" \ + "ramdiskaddr=0x4000000\0" \ "ramdiskfile=initramfs.gz\0" #define CONFIG_RAMBOOTCOMMAND \ diff --git a/include/fdtdec.h b/include/fdtdec.h index 7a1450c576..27b350e241 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -170,6 +170,7 @@ enum fdt_compat_id { COMPAT_ALTERA_SOCFPGA_DWC2USB, /* SoCFPGA DWC2 USB controller */ COMPAT_INTEL_BAYTRAIL_FSP, /* Intel Bay Trail FSP */ COMPAT_INTEL_BAYTRAIL_FSP_MDP, /* Intel FSP memory-down params */ + COMPAT_INTEL_IVYBRIDGE_FSP, /* Intel Ivy Bridge FSP */ COMPAT_COUNT, }; |
