[U-Boot,2/6] x86: Remove support for Advantech SOM-6896

Message ID 1533893978-12838-2-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Bin Meng
Headers show
Series
  • [U-Boot,1/6] x86: coreboot: Add generic coreboot payload support
Related show

Commit Message

Bin Meng Aug. 10, 2018, 9:39 a.m.
Now that we have generic coreboot payload support, remove the
dedicated support for Advantech SOM-6896.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/dts/Makefile               |  1 -
 arch/x86/dts/broadwell_som-6896.dts | 52 -------------------------------------
 include/configs/som-6896.h          | 28 --------------------
 3 files changed, 81 deletions(-)
 delete mode 100644 arch/x86/dts/broadwell_som-6896.dts
 delete mode 100644 include/configs/som-6896.h

Comments

George McCollister Aug. 10, 2018, 12:43 p.m. | #1
I don't have time to test the generic coreboot support on this board
right now but sounds fine to me.

Thanks,
George McCollister

On Fri, Aug 10, 2018 at 4:39 AM, Bin Meng <bmeng.cn@gmail.com> wrote:
> Now that we have generic coreboot payload support, remove the
> dedicated support for Advantech SOM-6896.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/dts/Makefile               |  1 -
>  arch/x86/dts/broadwell_som-6896.dts | 52 -------------------------------------
>  include/configs/som-6896.h          | 28 --------------------
>  3 files changed, 81 deletions(-)
>  delete mode 100644 arch/x86/dts/broadwell_som-6896.dts
>  delete mode 100644 include/configs/som-6896.h
>
> diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile
> index c62540f..fa717bc 100644
> --- a/arch/x86/dts/Makefile
> +++ b/arch/x86/dts/Makefile
> @@ -18,7 +18,6 @@ dtb-y += bayleybay.dtb \
>         qemu-x86_i440fx.dtb \
>         qemu-x86_q35.dtb \
>         theadorable-x86-dfi-bt700.dtb \
> -       broadwell_som-6896.dtb \
>         baytrail_som-db5800-som-6867.dtb
>
>  targets += $(dtb-y)
> diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts
> deleted file mode 100644
> index ec691f1..0000000
> --- a/arch/x86/dts/broadwell_som-6896.dts
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -/dts-v1/;
> -
> -/include/ "skeleton.dtsi"
> -/include/ "serial.dtsi"
> -/include/ "reset.dtsi"
> -/include/ "rtc.dtsi"
> -/include/ "tsc_timer.dtsi"
> -/include/ "coreboot_fb.dtsi"
> -
> -/ {
> -       model = "Advantech SOM-6896";
> -       compatible = "advantech,som-6896", "intel,broadwell";
> -
> -       aliases {
> -               spi0 = &spi;
> -       };
> -
> -       config {
> -              silent_console = <0>;
> -       };
> -
> -       chosen {
> -               stdout-path = "/serial";
> -       };
> -
> -       pci {
> -               compatible = "pci-x86";
> -               #address-cells = <3>;
> -               #size-cells = <2>;
> -               u-boot,dm-pre-reloc;
> -               ranges = <0x02000000 0x0 0xe0000000 0xe0000000 0 0x10000000
> -                       0x42000000 0x0 0xd0000000 0xd0000000 0 0x10000000
> -                       0x01000000 0x0 0x2000 0x2000 0 0xe000>;
> -
> -               pch@1f,0 {
> -                       reg = <0x0000f800 0 0 0 0>;
> -                       compatible = "intel,pch9";
> -
> -                       spi: spi {
> -                               #address-cells = <1>;
> -                               #size-cells = <0>;
> -                               compatible = "intel,ich9-spi";
> -                               spi-flash@0 {
> -                                       reg = <0>;
> -                                       compatible = "winbond,w25q128", "spi-flash";
> -                                       memory-map = <0xff000000 0x01000000>;
> -                               };
> -                       };
> -               };
> -       };
> -
> -};
> diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
> deleted file mode 100644
> index f0e8d61..0000000
> --- a/include/configs/som-6896.h
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Configuration settings for the SOM-6896
> - *
> - * Copyright (C) 2015 NovaTech LLC
> - * George McCollister <george.mccollister@gmail.com>
> - */
> -
> -#ifndef __CONFIG_H
> -#define __CONFIG_H
> -
> -#include <configs/x86-common.h>
> -
> -#define CONFIG_SYS_MONITOR_LEN         (1 << 20)
> -
> -#define CONFIG_MISC_INIT_R
> -
> -#define VIDEO_IO_OFFSET                        0
> -#define CONFIG_X86EMU_RAW_IO
> -
> -#define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,usbkbd\0" \
> -                                       "stdout=serial,vidconsole\0" \
> -                                       "stderr=serial,vidconsole\0"
> -
> -#define CONFIG_ENV_SECT_SIZE           0x1000
> -#define CONFIG_ENV_OFFSET              0x00ff0000
> -
> -#endif /* __CONFIG_H */
> --
> 2.7.4
>
Bin Meng Aug. 20, 2018, 5:57 a.m. | #2
On Fri, Aug 10, 2018 at 8:43 PM, George McCollister
<george.mccollister@gmail.com> wrote:
> I don't have time to test the generic coreboot support on this board
> right now but sounds fine to me.
>

applied to u-boot-x86, thanks!

Patch

diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile
index c62540f..fa717bc 100644
--- a/arch/x86/dts/Makefile
+++ b/arch/x86/dts/Makefile
@@ -18,7 +18,6 @@  dtb-y += bayleybay.dtb \
 	qemu-x86_i440fx.dtb \
 	qemu-x86_q35.dtb \
 	theadorable-x86-dfi-bt700.dtb \
-	broadwell_som-6896.dtb \
 	baytrail_som-db5800-som-6867.dtb
 
 targets += $(dtb-y)
diff --git a/arch/x86/dts/broadwell_som-6896.dts b/arch/x86/dts/broadwell_som-6896.dts
deleted file mode 100644
index ec691f1..0000000
--- a/arch/x86/dts/broadwell_som-6896.dts
+++ /dev/null
@@ -1,52 +0,0 @@ 
-/dts-v1/;
-
-/include/ "skeleton.dtsi"
-/include/ "serial.dtsi"
-/include/ "reset.dtsi"
-/include/ "rtc.dtsi"
-/include/ "tsc_timer.dtsi"
-/include/ "coreboot_fb.dtsi"
-
-/ {
-	model = "Advantech SOM-6896";
-	compatible = "advantech,som-6896", "intel,broadwell";
-
-	aliases {
-		spi0 = &spi;
-	};
-
-	config {
-	       silent_console = <0>;
-	};
-
-	chosen {
-		stdout-path = "/serial";
-	};
-
-	pci {
-		compatible = "pci-x86";
-		#address-cells = <3>;
-		#size-cells = <2>;
-		u-boot,dm-pre-reloc;
-		ranges = <0x02000000 0x0 0xe0000000 0xe0000000 0 0x10000000
-			0x42000000 0x0 0xd0000000 0xd0000000 0 0x10000000
-			0x01000000 0x0 0x2000 0x2000 0 0xe000>;
-
-		pch@1f,0 {
-			reg = <0x0000f800 0 0 0 0>;
-			compatible = "intel,pch9";
-
-			spi: spi {
-				#address-cells = <1>;
-				#size-cells = <0>;
-				compatible = "intel,ich9-spi";
-				spi-flash@0 {
-					reg = <0>;
-					compatible = "winbond,w25q128", "spi-flash";
-					memory-map = <0xff000000 0x01000000>;
-				};
-			};
-		};
-	};
-
-};
diff --git a/include/configs/som-6896.h b/include/configs/som-6896.h
deleted file mode 100644
index f0e8d61..0000000
--- a/include/configs/som-6896.h
+++ /dev/null
@@ -1,28 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration settings for the SOM-6896
- *
- * Copyright (C) 2015 NovaTech LLC
- * George McCollister <george.mccollister@gmail.com>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <configs/x86-common.h>
-
-#define CONFIG_SYS_MONITOR_LEN		(1 << 20)
-
-#define CONFIG_MISC_INIT_R
-
-#define VIDEO_IO_OFFSET			0
-#define CONFIG_X86EMU_RAW_IO
-
-#define CONFIG_STD_DEVICES_SETTINGS	"stdin=serial,usbkbd\0" \
-					"stdout=serial,vidconsole\0" \
-					"stderr=serial,vidconsole\0"
-
-#define CONFIG_ENV_SECT_SIZE		0x1000
-#define CONFIG_ENV_OFFSET		0x00ff0000
-
-#endif	/* __CONFIG_H */