From cf9f38064d048ac12cd3a7e1a40a84aa8071f712 Mon Sep 17 00:00:00 2001 From: Wolfgang Wallner Date: Fri, 14 Aug 2020 09:55:24 +0200 Subject: x86: mtrr: Fix parsing of "mtrr list" command The command 'mtrr' does not recognize the 'list' subcommand any more since the code restructuring in commit b2a76b3fe75a ("x86: mtrr: Restructure so command execution is in one place"). The if-else parsing the command arguments does not take 'list' into account: the if-branch is intended for no subcommands, the else-branch is intended for the non-list subcommands (which all expect additional arguments). Calling the 'mtrr list' subcommand leads to a "return CMD_RET_USAGE" in the else-branch. Fix this by changing the else-branch to explicitly checking for if (cmd != 'l'). Fixes: b2a76b3fe75a ("x86: mtrr: Restructure so command execution is in one place") Signed-off-by: Wolfgang Wallner Reviewed-by: Simon Glass Reviewed-by: Bin Meng Tested-by: Bin Meng --- cmd/x86/mtrr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/x86/mtrr.c b/cmd/x86/mtrr.c index e118bba5a2..99efecb9d8 100644 --- a/cmd/x86/mtrr.c +++ b/cmd/x86/mtrr.c @@ -121,7 +121,8 @@ static int do_mtrr(struct cmd_tbl *cmdtp, int flag, int argc, if (argc < 1 || !cmd) { cmd = 'l'; reg = 0; - } else { + } + if (cmd != 'l') { if (argc < 2) return CMD_RET_USAGE; reg = simple_strtoul(argv[1], NULL, 16); -- cgit v1.2.3 From 1d01d0c2f0962e26a3661a2a7d497afa3fc1ed34 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:20 +0300 Subject: x86: Introduce USE_EARLY_BOARD_INIT option Introduce USE_EARLY_BOARD_INIT option and select it by the actual users. Cc: George McCollister Signed-off-by: Andy Shevchenko Reviewed-by: Stefan Roese Reviewed-by: Aiden Park Reviewed-by: Bin Meng --- arch/x86/Kconfig | 3 +++ arch/x86/cpu/start.S | 3 +++ board/google/chromebook_coral/Kconfig | 1 + board/google/chromebook_link/Kconfig | 1 + board/google/chromebook_samus/Kconfig | 1 + 5 files changed, 9 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a34b108fff..76276c6027 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -203,6 +203,9 @@ config SPL_X86_32BIT_INIT help This is enabled when 32-bit init is in SPL +config USE_EARLY_BOARD_INIT + bool + config RESET_SEG_START hex depends on X86_RESET_VECTOR diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 4ad515ce08..3b6ed37bc0 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -88,6 +88,7 @@ _start: /* Clear the interrupt vectors */ lidt blank_idt_ptr +#ifdef CONFIG_USE_EARLY_BOARD_INIT /* * Critical early platform init - generally not used, we prefer init * to happen later when we have a console, in case something goes @@ -96,6 +97,8 @@ _start: jmp early_board_init .globl early_board_init_ret early_board_init_ret: +#endif + post_code(POST_START) /* Initialise Cache-As-RAM */ diff --git a/board/google/chromebook_coral/Kconfig b/board/google/chromebook_coral/Kconfig index 940bee89b0..27671958e1 100644 --- a/board/google/chromebook_coral/Kconfig +++ b/board/google/chromebook_coral/Kconfig @@ -18,6 +18,7 @@ config SYS_TEXT_BASE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select X86_RESET_VECTOR + select USE_EARLY_BOARD_INIT select INTEL_APOLLOLAKE select BOARD_ROMSIZE_KB_16384 diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig index 944716d002..dd29ddf694 100644 --- a/board/google/chromebook_link/Kconfig +++ b/board/google/chromebook_link/Kconfig @@ -19,6 +19,7 @@ config SYS_TEXT_BASE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select X86_RESET_VECTOR + select USE_EARLY_BOARD_INIT select NORTHBRIDGE_INTEL_IVYBRIDGE select HAVE_INTEL_ME select BOARD_ROMSIZE_KB_8192 diff --git a/board/google/chromebook_samus/Kconfig b/board/google/chromebook_samus/Kconfig index 90c23cba1b..9f66d79988 100644 --- a/board/google/chromebook_samus/Kconfig +++ b/board/google/chromebook_samus/Kconfig @@ -19,6 +19,7 @@ config SYS_TEXT_BASE config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select X86_RESET_VECTOR + select USE_EARLY_BOARD_INIT select INTEL_BROADWELL select HAVE_INTEL_ME select BOARD_ROMSIZE_KB_8192 -- cgit v1.2.3 From 45e2340d53e366b936556679cc110c531d6f5797 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:21 +0300 Subject: x86: advantech: som-db5800-som-6867: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Cc: George McCollister Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/advantech/som-db5800-som-6867/Makefile | 2 +- board/advantech/som-db5800-som-6867/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/advantech/som-db5800-som-6867/start.S diff --git a/board/advantech/som-db5800-som-6867/Makefile b/board/advantech/som-db5800-som-6867/Makefile index 0524766bb7..7975547f41 100644 --- a/board/advantech/som-db5800-som-6867/Makefile +++ b/board/advantech/som-db5800-som-6867/Makefile @@ -2,5 +2,5 @@ # # Copyright (C) 2015, Google, Inc -obj-y += som-db5800-som-6867.o start.o +obj-y += som-db5800-som-6867.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/advantech/som-db5800-som-6867/start.S b/board/advantech/som-db5800-som-6867/start.S deleted file mode 100644 index 65d1f7e961..0000000000 --- a/board/advantech/som-db5800-som-6867/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 -- cgit v1.2.3 From ebb2818bcb87a4be8bf47182030547d33d7a8ef2 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:22 +0300 Subject: x86: congatec: conga-qeval20-qa3-e3845: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Stefan Roese Reviewed-by: Bin Meng --- board/congatec/conga-qeval20-qa3-e3845/Makefile | 2 +- board/congatec/conga-qeval20-qa3-e3845/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/congatec/conga-qeval20-qa3-e3845/start.S diff --git a/board/congatec/conga-qeval20-qa3-e3845/Makefile b/board/congatec/conga-qeval20-qa3-e3845/Makefile index 2f04828a27..451a4fcd6c 100644 --- a/board/congatec/conga-qeval20-qa3-e3845/Makefile +++ b/board/congatec/conga-qeval20-qa3-e3845/Makefile @@ -2,5 +2,5 @@ # # Copyright (C) 2015, Google, Inc -obj-y += conga-qeval20-qa3.o start.o +obj-y += conga-qeval20-qa3.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/congatec/conga-qeval20-qa3-e3845/start.S b/board/congatec/conga-qeval20-qa3-e3845/start.S deleted file mode 100644 index 65d1f7e961..0000000000 --- a/board/congatec/conga-qeval20-qa3-e3845/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 -- cgit v1.2.3 From 85759d04cf04c8541e36b7def334f37c3d42e088 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:23 +0300 Subject: x86: coreboot: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/coreboot/coreboot/Makefile | 2 +- board/coreboot/coreboot/start.S | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 board/coreboot/coreboot/start.S diff --git a/board/coreboot/coreboot/Makefile b/board/coreboot/coreboot/Makefile index 8db7cc62f3..d292b7032c 100644 --- a/board/coreboot/coreboot/Makefile +++ b/board/coreboot/coreboot/Makefile @@ -10,4 +10,4 @@ # (C) Copyright 2002 # Daniel Engström, Omicron Ceti AB, daniel@omicron.se. -obj-y += start.o coreboot.o +obj-y += coreboot.o diff --git a/board/coreboot/coreboot/start.S b/board/coreboot/coreboot/start.S deleted file mode 100644 index aa702622d4..0000000000 --- a/board/coreboot/coreboot/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 -- cgit v1.2.3 From 9f082a8adce1a80f7680a6b449c27af84f7db031 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:24 +0300 Subject: x86: dfi: dfi-bt700: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Stefan Roese Reviewed-by: Bin Meng --- board/dfi/dfi-bt700/Makefile | 2 +- board/dfi/dfi-bt700/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/dfi/dfi-bt700/start.S diff --git a/board/dfi/dfi-bt700/Makefile b/board/dfi/dfi-bt700/Makefile index 99cf357b70..50d88f2954 100644 --- a/board/dfi/dfi-bt700/Makefile +++ b/board/dfi/dfi-bt700/Makefile @@ -2,5 +2,5 @@ # # Copyright (C) 2015, Google, Inc -obj-y += dfi-bt700.o start.o +obj-y += dfi-bt700.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/dfi/dfi-bt700/start.S b/board/dfi/dfi-bt700/start.S deleted file mode 100644 index 65d1f7e961..0000000000 --- a/board/dfi/dfi-bt700/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 -- cgit v1.2.3 From 2a2470eba86a05b5674deedc76c254e73a70bc35 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:25 +0300 Subject: x86: efi: efi-x86_payload: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/efi/efi-x86_payload/Makefile | 2 +- board/efi/efi-x86_payload/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/efi/efi-x86_payload/start.S diff --git a/board/efi/efi-x86_payload/Makefile b/board/efi/efi-x86_payload/Makefile index 00ef69534d..a4ebc85aa5 100644 --- a/board/efi/efi-x86_payload/Makefile +++ b/board/efi/efi-x86_payload/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2018, Bin Meng -obj-y += start.o payload.o +obj-y += payload.o diff --git a/board/efi/efi-x86_payload/start.S b/board/efi/efi-x86_payload/start.S deleted file mode 100644 index f7eaa7cb12..0000000000 --- a/board/efi/efi-x86_payload/start.S +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2018, Bin Meng - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From a97e6af4221dca741db4e0d137136d6f9c0bb8dc Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:26 +0300 Subject: x86: intel: bayleybay: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/bayleybay/Makefile | 2 +- board/intel/bayleybay/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/bayleybay/start.S 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 -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 - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From d196c18bc802188611e7a96cc3fcb18e634e7fab Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:27 +0300 Subject: x86: intel: cherryhill: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/cherryhill/Makefile | 2 +- board/intel/cherryhill/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/cherryhill/start.S 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 -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 - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From 41a93718d83fcc9995acdcd71612baf026fdd8c0 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:28 +0300 Subject: x86: intel: cougarcanyon2: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/cougarcanyon2/Makefile | 2 +- board/intel/cougarcanyon2/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/cougarcanyon2/start.S 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 -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 - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From e5de5e06254f321093fc76b309cbb9004c37337e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:29 +0300 Subject: x86: intel: crownbay: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/crownbay/Makefile | 2 +- board/intel/crownbay/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/crownbay/start.S 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 -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 - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From b2253bcaa7f2d5322114c80997a9193c48ff74c0 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:30 +0300 Subject: x86: intel: edison: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/edison/Makefile | 2 +- board/intel/edison/start.S | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 board/intel/edison/start.S 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 -- cgit v1.2.3 From 9278031ae5f1e9b319a67be8262b22d441677e5b Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:31 +0300 Subject: x86: intel: galileo: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/galileo/Makefile | 2 +- board/intel/galileo/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/galileo/start.S 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 -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 - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From 886bce12756ca3f3dee05ccdc39130dacc4ffba0 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:32 +0300 Subject: x86: intel: minnowmax: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/intel/minnowmax/Makefile | 2 +- board/intel/minnowmax/start.S | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 board/intel/minnowmax/start.S 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 -- cgit v1.2.3 From c2addf9fc171de55d99fcccd7e5622894f74fe18 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Thu, 20 Aug 2020 13:02:33 +0300 Subject: x86: intel: slimbootloader: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply drop the rule from it. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Aiden Park Reviewed-by: Bin Meng --- board/intel/slimbootloader/Makefile | 2 +- board/intel/slimbootloader/start.S | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 board/intel/slimbootloader/start.S 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 -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 - */ - -/* board early initialization */ -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From 365a581c1cbbb43c1d8da49d5bfd134530c1a621 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Tue, 1 Sep 2020 11:33:52 +0300 Subject: x86: qemu: Remove dead code start.S does nothing and can be safely removed. Makefile is still being used by the build system, so simply replace the rule in it. We use stub C-file like it's done for other boards. Signed-off-by: Andy Shevchenko Reviewed-by: Simon Glass Reviewed-by: Bin Meng --- board/emulation/qemu-x86/Makefile | 2 +- board/emulation/qemu-x86/qemu-x86.c | 0 board/emulation/qemu-x86/start.S | 8 -------- 3 files changed, 1 insertion(+), 9 deletions(-) create mode 100644 board/emulation/qemu-x86/qemu-x86.c delete mode 100644 board/emulation/qemu-x86/start.S diff --git a/board/emulation/qemu-x86/Makefile b/board/emulation/qemu-x86/Makefile index 782e298b74..ff4aaa51c5 100644 --- a/board/emulation/qemu-x86/Makefile +++ b/board/emulation/qemu-x86/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2015, Bin Meng -obj-y += start.o +obj-y += qemu-x86.o diff --git a/board/emulation/qemu-x86/qemu-x86.c b/board/emulation/qemu-x86/qemu-x86.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/board/emulation/qemu-x86/start.S b/board/emulation/qemu-x86/start.S deleted file mode 100644 index e4bde561b2..0000000000 --- a/board/emulation/qemu-x86/start.S +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2015, Bin Meng - */ - -.globl early_board_init -early_board_init: - jmp early_board_init_ret -- cgit v1.2.3 From 0a0cdeceecc4dca3954fa611ca45d7693c7b2c32 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Aug 2020 15:23:06 -0600 Subject: x86: pinctrl: Fix 'relatove' typo Fix this typo in the Kconfig help. Suggested-by: Wolfgang Wallner Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- drivers/pinctrl/intel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/intel/Kconfig b/drivers/pinctrl/intel/Kconfig index 1acc5dabb0..316a8fe27f 100644 --- a/drivers/pinctrl/intel/Kconfig +++ b/drivers/pinctrl/intel/Kconfig @@ -22,7 +22,7 @@ config INTEL_PINCTRL_MULTI_ACPI_DEVICES Enable this if the pinctrl devices are modelled as multiple, separate ACPI devices in the ACPI tables. If enabled, the ACPI devices match the U-Boot pinctrl devices and the pin 'offset' is - relatove to a particular pinctrl device. If disabled, there is a + relative to a particular pinctrl device. If disabled, there is a single ACPI pinctrl device which includes all U-Boot pinctrl devices and the pin 'offset' is in effect a global pin number. -- cgit v1.2.3 From 1150a0b6bd70084eb5c8b9ecfc60100cb7a768e2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Aug 2020 15:23:07 -0600 Subject: x86: Drop nhlt_serialise() This function is not actually used in U-Boot. Drop it. Suggested-by: Bin Meng Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/acpi_nhlt.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/x86/include/asm/acpi_nhlt.h b/arch/x86/include/asm/acpi_nhlt.h index 4720321381..2c44196317 100644 --- a/arch/x86/include/asm/acpi_nhlt.h +++ b/arch/x86/include/asm/acpi_nhlt.h @@ -137,14 +137,6 @@ int nhlt_endpoint_add_formats(struct nhlt_endpoint *endpoint, */ void nhlt_next_instance(struct nhlt *nhlt, int link_type); -/* - * Serialize NHLT object to ACPI table. Take in the beginning address of where - * the table will reside and return the address of the next ACPI table. On - * error 0 will be returned. The NHLT object is no longer valid after this - * function is called. - */ -uintptr_t nhlt_serialise(struct nhlt *nhlt, uintptr_t acpi_addr); - /* * Serialize NHLT object to ACPI table. Take in the beginning address of where * the table will reside oem_id and oem_table_id and return the address of the -- cgit v1.2.3