Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

- Fix parsing of "mtrr list" command
- Introduce USE_EARLY_BOARD_INIT option and remove dead codes for most
  x86 boards

16 files changed, 8 insertions, 77 deletions

diff --git a/board/intel/bayleybay/Makefile b/board/intel/bayleybay/Makefile
index e0553f1462..d19447184a 100644
--- a/board/intel/bayleybay/Makefile
+++ b/board/intel/bayleybay/Makefile
@@ -2,5 +2,5 @@
 #
 # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y	+= bayleybay.o start.o
+obj-y	+= bayleybay.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
diff --git a/board/intel/bayleybay/start.S b/board/intel/bayleybay/start.S
deleted file mode 100644
index e4bde561b2..0000000000
--- a/board/intel/bayleybay/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/cherryhill/Makefile b/board/intel/cherryhill/Makefile
index b09581a919..ff6e14836a 100644
--- a/board/intel/cherryhill/Makefile
+++ b/board/intel/cherryhill/Makefile
@@ -2,4 +2,4 @@
 #
 # Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y	+= cherryhill.o start.o
+obj-y	+= cherryhill.o
diff --git a/board/intel/cherryhill/start.S b/board/intel/cherryhill/start.S
deleted file mode 100644
index 2e3e7f8409..0000000000
--- a/board/intel/cherryhill/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2017, Bin Meng <bmeng.cn@gmail.com>
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/cougarcanyon2/Makefile b/board/intel/cougarcanyon2/Makefile
index 75cc508f4e..13b19ae653 100644
--- a/board/intel/cougarcanyon2/Makefile
+++ b/board/intel/cougarcanyon2/Makefile
@@ -2,4 +2,4 @@
 #
 # Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y	+= cougarcanyon2.o start.o
+obj-y	+= cougarcanyon2.o
diff --git a/board/intel/cougarcanyon2/start.S b/board/intel/cougarcanyon2/start.S
deleted file mode 100644
index 8521800921..0000000000
--- a/board/intel/cougarcanyon2/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/crownbay/Makefile b/board/intel/crownbay/Makefile
index b52c69aeaa..6abd3eeb55 100644
--- a/board/intel/crownbay/Makefile
+++ b/board/intel/crownbay/Makefile
@@ -2,4 +2,4 @@
 #
 # Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y	+= crownbay.o start.o
+obj-y	+= crownbay.o
diff --git a/board/intel/crownbay/start.S b/board/intel/crownbay/start.S
deleted file mode 100644
index 7faa7d05fa..0000000000
--- a/board/intel/crownbay/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com>
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/edison/Makefile b/board/intel/edison/Makefile
index eed8d65eb6..1eaf7ca7f8 100644
--- a/board/intel/edison/Makefile
+++ b/board/intel/edison/Makefile
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y	+= start.o edison.o
+obj-y	+= edison.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
diff --git a/board/intel/edison/start.S b/board/intel/edison/start.S
deleted file mode 100644
index aa702622d4..0000000000
--- a/board/intel/edison/start.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2011 The Chromium OS Authors.
- * (C) Copyright 2008
- * Graeme Russ, graeme.russ@gmail.com.
- */
-
-/* board early intialization */
-.globl early_board_init
-early_board_init:
-	/* No 32-bit board specific initialisation */
-	jmp	early_board_init_ret
diff --git a/board/intel/galileo/Makefile b/board/intel/galileo/Makefile
index e8f58bff9a..4130bb0236 100644
--- a/board/intel/galileo/Makefile
+++ b/board/intel/galileo/Makefile
@@ -2,5 +2,5 @@
 #
 # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
 
-obj-y	+= galileo.o start.o
+obj-y	+= galileo.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
diff --git a/board/intel/galileo/start.S b/board/intel/galileo/start.S
deleted file mode 100644
index e4bde561b2..0000000000
--- a/board/intel/galileo/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/minnowmax/Makefile b/board/intel/minnowmax/Makefile
index 989344df1c..d339b5ad0a 100644
--- a/board/intel/minnowmax/Makefile
+++ b/board/intel/minnowmax/Makefile
@@ -2,5 +2,5 @@
 #
 # Copyright (C) 2015, Google, Inc
 
-obj-y	+= minnowmax.o start.o
+obj-y	+= minnowmax.o
 obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o
diff --git a/board/intel/minnowmax/start.S b/board/intel/minnowmax/start.S
deleted file mode 100644
index 65d1f7e961..0000000000
--- a/board/intel/minnowmax/start.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2015, Google, Inc
- */
-
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret
diff --git a/board/intel/slimbootloader/Makefile b/board/intel/slimbootloader/Makefile
index fd8fa98a8d..50330cc6e5 100644
--- a/board/intel/slimbootloader/Makefile
+++ b/board/intel/slimbootloader/Makefile
@@ -2,4 +2,4 @@
 #
 # Copyright (C) 2019 Intel Corporation <www.intel.com>
 
-obj-y	+= start.o slimbootloader.o
+obj-y	+= slimbootloader.o
diff --git a/board/intel/slimbootloader/start.S b/board/intel/slimbootloader/start.S
deleted file mode 100644
index 5c3f3df09e..0000000000
--- a/board/intel/slimbootloader/start.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2019 Intel Corporation <www.intel.com>
- */
-
-/* board early initialization */
-.globl early_board_init
-early_board_init:
-	jmp	early_board_init_ret