sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Replace CONFIG(ARCH_xx) tests

Browse Source 
Once we support building stages for different architectures,
such CONFIG(ARCH_xx) tests do not evaluate correctly anymore.

Change-Id: I599995b3ed5c4dfd578c87067fe8bfc8c75b9d43
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42183
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2020-06-08 06:05:03 +03:00
committed by Angel Pons
parent 5edbb1c5d9
commit 7336f97deb
16 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/device.c
View File

@@ -12,7 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include <smp/spinlock.h>
#if CONFIG(ARCH_X86)
#if ENV_X86
#include <arch/ebda.h>
#endif
#include <timer.h>
@@ -566,7 +566,7 @@ void dev_initialize(void)
printk(BIOS_INFO, "Initializing devices...\n");
#if CONFIG(ARCH_X86)
#if ENV_X86
/* Ensure EBDA is prepared before Option ROMs. */
setup_default_ebda();
#endif

2
src/device/oprom/include/io.h
View File

@@ -3,7 +3,7 @@
#ifndef __OPROM_IO_H__
#define __OPROM_IO_H__
#if CONFIG(ARCH_X86)
#if ENV_X86
#include <arch/io.h>
#else
void outb(u8 val, u16 port);

2
src/device/oprom/yabel/compat/functions.c
View File

@@ -72,7 +72,7 @@ unsigned long tb_freq = 0;
u64 get_time(void)
{
u64 act = 0;
#if CONFIG(ARCH_X86)
#if ENV_X86
u32 eax, edx;
__asm__ __volatile__(

8
src/device/oprom/yabel/device.h
View File

@@ -151,7 +151,7 @@ u8 biosemu_dev_translate_address(int type, unsigned long * addr);
static inline void
out32le(void *addr, u32 val)
{
#if CONFIG(ARCH_X86) || CONFIG(ARCH_ARM)
#if ENV_X86 || ENV_ARM || ENV_ARM64
*((u32*) addr) = cpu_to_le32(val);
#else
asm volatile ("stwbrx %0, 0, %1"::"r" (val), "r"(addr));
@@ -162,7 +162,7 @@ static inline u32
in32le(void *addr)
{
u32 val;
#if CONFIG(ARCH_X86) || CONFIG(ARCH_ARM)
#if ENV_X86 || ENV_ARM || ENV_ARM64
val = cpu_to_le32(*((u32 *) addr));
#else
asm volatile ("lwbrx %0, 0, %1":"=r" (val):"r"(addr));
@@ -173,7 +173,7 @@ in32le(void *addr)
static inline void
out16le(void *addr, u16 val)
{
#if CONFIG(ARCH_X86) || CONFIG(ARCH_ARM)
#if ENV_X86 || ENV_ARM || ENV_ARM64
*((u16*) addr) = cpu_to_le16(val);
#else
asm volatile ("sthbrx %0, 0, %1"::"r" (val), "r"(addr));
@@ -184,7 +184,7 @@ static inline u16
in16le(void *addr)
{
u16 val;
#if CONFIG(ARCH_X86) || CONFIG(ARCH_ARM)
#if ENV_X86 || ENV_ARM || ENV_ARM64
val = cpu_to_le16(*((u16*) addr));
#else
asm volatile ("lhbrx %0, 0, %1":"=r" (val):"r"(addr));