diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
| commit | 6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch) | |
| tree | 6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /include/configs | |
| parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
| parent | 8216b11cdd50515fbc423a4b2709a00865b8621d (diff) | |
| download | talos-obmc-uboot-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.gz talos-obmc-uboot-6d54868eeb2697c9a905c4d3521efbacc44c5258.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/minnowmax.h | 2 | ||||
| -rw-r--r-- | include/configs/x86-common.h | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 674d1f602b..95ad1287f6 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -40,6 +40,6 @@ #define CONFIG_X86EMU_RAW_IO #define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_OFFSET 0x007fe000 +#define CONFIG_ENV_OFFSET 0x006ef000 #endif /* __CONFIG_H */ diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b79f47baf3..b4aad6cd24 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -193,14 +193,19 @@ #define CONFIG_HOSTNAME x86 #define CONFIG_BOOTFILE "bzImage" #define CONFIG_LOADADDR 0x1000000 -#define CONFIG_RAMDISK_ADDR 0x4000000 +#define CONFIG_RAMDISK_ADDR 0x4000000 +#ifdef CONFIG_GENERATE_ACPI_TABLE +#define CONFIG_OTHBOOTARGS "othbootargs=\0" +#else +#define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0" +#endif #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_STD_DEVICES_SETTINGS \ "pciconfighost=1\0" \ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ - "othbootargs=acpi=off\0" \ + CONFIG_OTHBOOTARGS \ "ramdiskaddr=0x4000000\0" \ "ramdiskfile=initramfs.gz\0" |
