diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-30 10:37:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-30 10:37:43 -0500 |
| commit | 6ea51d286093aa21619cc2a55263caf1e9d5f340 (patch) | |
| tree | 3f9bc9a21a1351de300f73ea5b9706e3053ef955 /arch/x86/cpu | |
| parent | 34dd853ce5f44d34bfb0358c73da2fe9f2a4e5d1 (diff) | |
| parent | aa7839b39c2ee77f9ab8c393c56b8d812507dbb7 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/cpu.c | 4 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c index e13786efa5..1c42584e76 100644 --- a/arch/x86/cpu/cpu.c +++ b/arch/x86/cpu/cpu.c @@ -143,8 +143,8 @@ const char *cpu_vendor_name(int vendor) { const char *name; name = "<invalid cpu vendor>"; - if ((vendor < (ARRAY_SIZE(x86_vendor_name))) && - (x86_vendor_name[vendor] != 0)) + if (vendor < ARRAY_SIZE(x86_vendor_name) && + x86_vendor_name[vendor]) name = x86_vendor_name[vendor]; return name; diff --git a/arch/x86/cpu/qemu/Kconfig b/arch/x86/cpu/qemu/Kconfig index da378128fe..81444f3d9e 100644 --- a/arch/x86/cpu/qemu/Kconfig +++ b/arch/x86/cpu/qemu/Kconfig @@ -18,7 +18,7 @@ if QEMU config SYS_CAR_ADDR hex - default 0xd0000 + default 0x10000 config SYS_CAR_SIZE hex |