From 9ff8f6f818d4e5a8aa0fe21cbfaba9ccd865bc7b Mon Sep 17 00:00:00 2001
From: Julius Werner <jwerner@chromium.org>
Date: Mon, 23 Feb 2015 14:31:09 -0800
Subject: Unify byte order macros and clrsetbits

This patch removes quite a bit of code duplication between cpu_to_le32()
and clrsetbits_le32() style macros on the different architectures. This
also syncs those macros back up to the new write32(a, v) style IO
accessor macros that are now used on ARM and ARM64.

CQ-DEPEND=CL:254862
BRANCH=none
BUG=chromium:444723
TEST=Compiled Cosmos, Daisy, Blaze, Falco, Pinky, Pit, Rambi, Ryu,
Storm and Urara. Booted on Jerry. Tried to compare binary images...
unfortunately something about the new macro notation makes the compiler
evaluate it more efficiently (not recalculating the address between the
read and the write), so this was of limited value.

Change-Id: If8ab62912c952d68a67a0f71e82b038732cd1317
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: fd43bf446581bfb84bec4f2ebb56b5de95971c3b
Original-Change-Id: I7d301b5bb5ac0db7f5ff39e3adc2b28a1f402a72
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/254866
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9838
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/mainboard/amd/inagua/broadcom.c       | 2 +-
 src/mainboard/google/butterfly/romstage.c | 1 -
 src/mainboard/google/link/romstage.c      | 1 -
 src/mainboard/google/parrot/romstage.c    | 1 -
 src/mainboard/google/samus/spd/spd.c      | 2 +-
 src/mainboard/google/stout/romstage.c     | 1 -
 src/mainboard/samsung/lumpy/romstage.c    | 1 -
 src/mainboard/samsung/stumpy/romstage.c   | 1 -
 8 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/amd/inagua/broadcom.c b/src/mainboard/amd/inagua/broadcom.c
index 86de3b4552..2807870f87 100644
--- a/src/mainboard/amd/inagua/broadcom.c
+++ b/src/mainboard/amd/inagua/broadcom.c
@@ -29,11 +29,11 @@
  */
 
 #include <types.h>
-#include <arch/byteorder.h>
 #include <console/console.h>
 #include <device/device.h>	//Coreboot device access
 #include <device/pci.h>
 #include <delay.h>
+#include <endian.h>
 
 void broadcom_init(void);
 
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index 7f9ab605cd..1753cd57e5 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index 2e7ee5240e..5844aa6168 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index f2e7345ce5..ab82bde63c 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/google/samus/spd/spd.c b/src/mainboard/google/samus/spd/spd.c
index 4f4f9efac9..1308ab262d 100644
--- a/src/mainboard/google/samus/spd/spd.c
+++ b/src/mainboard/google/samus/spd/spd.c
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <arch/byteorder.h>
 #include <cbfs.h>
 #include <console/console.h>
+#include <endian.h>
 #include <string.h>
 #include <soc/gpio.h>
 #include <soc/pei_data.h>
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index 714d8f13c9..6a6aa480dd 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index e63a8f9964..29a238a140 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -23,7 +23,6 @@
 #include <lib.h>
 #include <timestamp.h>
 #include <arch/io.h>
-#include <arch/byteorder.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 5db877337a..346026f45e 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <lib.h>
 #include <timestamp.h>
-#include <arch/byteorder.h>
 #include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/pnp_def.h>
-- 
cgit v1.2.3