Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38093 )
Change subject: mb/hp/8470p: Transform into variant ......................................................................
mb/hp/8470p: Transform into variant
Change-Id: I6dbecb0b4d38ed4af8966f5391fce1f2c9c5d182 Signed-off-by: Angel Pons th3fanbus@gmail.com --- D src/mainboard/hp/8470p/Kconfig D src/mainboard/hp/8470p/Kconfig.name D src/mainboard/hp/8470p/Makefile.inc D src/mainboard/hp/8470p/acpi/ec.asl D src/mainboard/hp/8470p/acpi/platform.asl D src/mainboard/hp/8470p/acpi/superio.asl D src/mainboard/hp/8470p/acpi_tables.c D src/mainboard/hp/8470p/cmos.default D src/mainboard/hp/8470p/cmos.layout D src/mainboard/hp/8470p/dsdt.asl D src/mainboard/hp/8470p/mainboard.c M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig.name R src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt R src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb R src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c 19 files changed, 14 insertions(+), 362 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/38093/1
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig deleted file mode 100644 index 24bedec..0000000 --- a/src/mainboard/hp/8470p/Kconfig +++ /dev/null @@ -1,61 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2017 Iru Cai mytbk920423@gmail.com -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# - -if BOARD_HP_8470P - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_16384 - select EC_HP_KBC1126 - select GFX_GMA_INTERNAL_IS_LVDS - select HAVE_ACPI_RESUME - select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE - select INTEL_INT15 - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_USES_IFD_GBE_REGION - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_SMSC_LPC47N217 - select SYSTEM_TYPE_LAPTOP - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "hp/8470p" - -config MAINBOARD_PART_NUMBER - string - default "EliteBook 8470p" - -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - -config MAX_CPUS - int - default 8 - -config USBDEBUG_HCD_INDEX - int - default 2 - -endif diff --git a/src/mainboard/hp/8470p/Kconfig.name b/src/mainboard/hp/8470p/Kconfig.name deleted file mode 100644 index 474da03..0000000 --- a/src/mainboard/hp/8470p/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_HP_8470P - bool "EliteBook 8470p" diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc deleted file mode 100644 index 1d25875..0000000 --- a/src/mainboard/hp/8470p/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -bootblock-y += gpio.c -romstage-y += gpio.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads -bootblock-y += early_init.c -romstage-y += early_init.c diff --git a/src/mainboard/hp/8470p/acpi/ec.asl b/src/mainboard/hp/8470p/acpi/ec.asl deleted file mode 100644 index ac65fb3..0000000 --- a/src/mainboard/hp/8470p/acpi/ec.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Iru Cai mytbk920423@gmail.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <ec/hp/kbc1126/acpi/ec.asl> diff --git a/src/mainboard/hp/8470p/acpi/platform.asl b/src/mainboard/hp/8470p/acpi/platform.asl deleted file mode 100644 index fe0f936..0000000 --- a/src/mainboard/hp/8470p/acpi/platform.asl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011-2012 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -Method(_WAK,1) -{ - _SB.PCI0.LPCB.EC0.ACPI = 1 - _SB.PCI0.LPCB.EC0.SLPT = 0 - - Return(Package(){0,0}) -} - -Method(_PTS,1) -{ - _SB.PCI0.LPCB.EC0.SLPT = Arg0 -} diff --git a/src/mainboard/hp/8470p/acpi/superio.asl b/src/mainboard/hp/8470p/acpi/superio.asl deleted file mode 100644 index b3ea115..0000000 --- a/src/mainboard/hp/8470p/acpi/superio.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/hp/8470p/acpi_tables.c b/src/mainboard/hp/8470p/acpi_tables.c deleted file mode 100644 index b278512..0000000 --- a/src/mainboard/hp/8470p/acpi_tables.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <southbridge/intel/bd82x6x/nvs.h> - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - // the lid is open by default. - gnvs->lids = 1; - - gnvs->tcrt = 100; - gnvs->tpsv = 90; -} diff --git a/src/mainboard/hp/8470p/cmos.default b/src/mainboard/hp/8470p/cmos.default deleted file mode 100644 index ba33ddf..0000000 --- a/src/mainboard/hp/8470p/cmos.default +++ /dev/null @@ -1,6 +0,0 @@ -boot_option=Fallback -debug_level=Debug -power_on_after_fail=Disable -nmi=Enable -volume=0x3 -sata_mode=AHCI diff --git a/src/mainboard/hp/8470p/cmos.layout b/src/mainboard/hp/8470p/cmos.layout deleted file mode 100644 index f1526f3..0000000 --- a/src/mainboard/hp/8470p/cmos.layout +++ /dev/null @@ -1,116 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## Copyright (C) 2014 Vladimir Serbinenko -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -# ----------------------------------------------------------------- -entries - -# ----------------------------------------------------------------- -# Status Register A -# ----------------------------------------------------------------- -# Status Register B -# ----------------------------------------------------------------- -# Status Register C -#96 4 r 0 status_c_rsvd -#100 1 r 0 uf_flag -#101 1 r 0 af_flag -#102 1 r 0 pf_flag -#103 1 r 0 irqf_flag -# ----------------------------------------------------------------- -# Status Register D -#104 7 r 0 status_d_rsvd -#111 1 r 0 valid_cmos_ram -# ----------------------------------------------------------------- -# Diagnostic Status Register -#112 8 r 0 diag_rsvd1 - -# ----------------------------------------------------------------- -0 120 r 0 reserved_memory -#120 264 r 0 unused - -# ----------------------------------------------------------------- -# RTC_BOOT_BYTE (coreboot hardcoded) -384 1 e 4 boot_option -388 4 h 0 reboot_counter -#390 2 r 0 unused? - -# ----------------------------------------------------------------- -# coreboot config options: console -#392 3 r 0 unused -395 4 e 6 debug_level -#399 1 r 0 unused - -#400 8 r 0 reserved for century byte - -# coreboot config options: southbridge -408 1 e 1 nmi -409 2 e 7 power_on_after_fail - -421 1 e 9 sata_mode - -# coreboot config options: cpu -#424 8 r 0 unused - -# coreboot config options: northbridge -432 3 e 11 gfx_uma_size -#435 5 r 0 unused - -440 8 h 0 volume - -# SandyBridge MRC Scrambler Seed values -896 32 r 0 mrc_scrambler_seed -928 32 r 0 mrc_scrambler_seed_s3 -960 16 r 0 mrc_scrambler_seed_chk - -# coreboot config options: check sums -984 16 h 0 check_sum - -# ----------------------------------------------------------------- - -enumerations - -#ID value text -1 0 Disable -1 1 Enable -2 0 Enable -2 1 Disable -4 0 Fallback -4 1 Normal -6 0 Emergency -6 1 Alert -6 2 Critical -6 3 Error -6 4 Warning -6 5 Notice -6 6 Info -6 7 Debug -6 8 Spew -7 0 Disable -7 1 Enable -7 2 Keep -9 0 AHCI -9 1 Compatible -11 0 32M -11 1 64M -11 2 96M -11 3 128M -11 4 160M -11 5 192M -11 6 224M - -# ----------------------------------------------------------------- -checksums - -checksum 392 447 984 diff --git a/src/mainboard/hp/8470p/dsdt.asl b/src/mainboard/hp/8470p/dsdt.asl deleted file mode 100644 index 81f45c1..0000000 --- a/src/mainboard/hp/8470p/dsdt.asl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#define BRIGHTNESS_UP _SB.PCI0.GFX0.INCB -#define BRIGHTNESS_DOWN _SB.PCI0.GFX0.DECB -#define ACPI_VIDEO_DEVICE _SB.PCI0.GFX0 -#include <arch/acpi.h> -DefinitionBlock( - "dsdt.aml", - "DSDT", - 0x02, // DSDT revision: ACPI v2.0 and up - OEM_ID, - ACPI_TABLE_CREATOR, - 0x20141018 // OEM revision -) -{ - #include "acpi/platform.asl" - #include <cpu/intel/common/acpi/cpu.asl> - #include <southbridge/intel/common/acpi/platform.asl> - /* global NVS and variables. */ - #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <southbridge/intel/common/acpi/sleepstates.asl> - - Scope (_SB) { - Device (PCI0) - { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <drivers/intel/gma/acpi/default_brightness_levels.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - } - } -} diff --git a/src/mainboard/hp/8470p/mainboard.c b/src/mainboard/hp/8470p/mainboard.c deleted file mode 100644 index effba5e..0000000 --- a/src/mainboard/hp/8470p/mainboard.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Iru Cai mytbk920423@gmail.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> - -static void mainboard_enable(struct device *dev) -{ - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig index 30b83a7..f581b44 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig @@ -36,12 +36,14 @@ default "2570p" if BOARD_HP_2570P default "2760p" if BOARD_HP_2760P default "8460p" if BOARD_HP_8460P + default "8470p" if BOARD_HP_8470P
config MAINBOARD_PART_NUMBER string default "EliteBook 2570p" if BOARD_HP_2570P default "EliteBook 2760p" if BOARD_HP_2760P default "EliteBook 8460p" if BOARD_HP_8460P + default "EliteBook 8470p" if BOARD_HP_8470P
config DEVICETREE string @@ -66,5 +68,6 @@ default 2 if BOARD_HP_2570P default 1 if BOARD_HP_2760P default 1 if BOARD_HP_8460P + default 2 if BOARD_HP_8470P
endif diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name index d91c762..db5d71e 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name @@ -49,3 +49,14 @@ select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_LPC47N217
+config BOARD_HP_8470P + bool "EliteBook 8470p" + + select BOARD_HP_SNB_IVB_LAPTOPS + select BOARD_ROMSIZE_KB_16384 + select GFX_GMA_INTERNAL_IS_LVDS + select INTEL_INT15 + select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_USES_IFD_GBE_REGION + select SOUTHBRIDGE_INTEL_C216 + select SUPERIO_SMSC_LPC47N217 diff --git a/src/mainboard/hp/8470p/board_info.txt b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt similarity index 100% rename from src/mainboard/hp/8470p/board_info.txt rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb similarity index 100% rename from src/mainboard/hp/8470p/devicetree.cb rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb diff --git a/src/mainboard/hp/8470p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c similarity index 100% rename from src/mainboard/hp/8470p/early_init.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c diff --git a/src/mainboard/hp/8470p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads similarity index 100% rename from src/mainboard/hp/8470p/gma-mainboard.ads rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads diff --git a/src/mainboard/hp/8470p/gpio.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c similarity index 100% rename from src/mainboard/hp/8470p/gpio.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c diff --git a/src/mainboard/hp/8470p/hda_verb.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c similarity index 100% rename from src/mainboard/hp/8470p/hda_verb.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c
Hello build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38093
to look at the new patch set (#2).
Change subject: mb/hp/8470p: Transform into variant ......................................................................
mb/hp/8470p: Transform into variant
Change-Id: I6dbecb0b4d38ed4af8966f5391fce1f2c9c5d182 Signed-off-by: Angel Pons th3fanbus@gmail.com --- D src/mainboard/hp/8470p/Kconfig D src/mainboard/hp/8470p/Kconfig.name D src/mainboard/hp/8470p/Makefile.inc D src/mainboard/hp/8470p/acpi/ec.asl D src/mainboard/hp/8470p/acpi/platform.asl D src/mainboard/hp/8470p/acpi/superio.asl D src/mainboard/hp/8470p/acpi_tables.c D src/mainboard/hp/8470p/cmos.default D src/mainboard/hp/8470p/cmos.layout D src/mainboard/hp/8470p/dsdt.asl D src/mainboard/hp/8470p/mainboard.c M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig.name R src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt R src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb R src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c 19 files changed, 15 insertions(+), 362 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/38093/2
Hello Iru Cai (vimacs), build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38093
to look at the new patch set (#3).
Change subject: mb/hp/8470p: Transform into variant ......................................................................
mb/hp/8470p: Transform into variant
Tested with BUILD_TIMELESS=1, binary does not change.
Change-Id: I6dbecb0b4d38ed4af8966f5391fce1f2c9c5d182 Signed-off-by: Angel Pons th3fanbus@gmail.com --- D src/mainboard/hp/8470p/Kconfig D src/mainboard/hp/8470p/Kconfig.name D src/mainboard/hp/8470p/Makefile.inc D src/mainboard/hp/8470p/acpi/ec.asl D src/mainboard/hp/8470p/acpi/platform.asl D src/mainboard/hp/8470p/acpi/superio.asl D src/mainboard/hp/8470p/acpi_tables.c D src/mainboard/hp/8470p/cmos.default D src/mainboard/hp/8470p/cmos.layout D src/mainboard/hp/8470p/dsdt.asl D src/mainboard/hp/8470p/mainboard.c M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig.name R src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt R src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb R src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c 19 files changed, 15 insertions(+), 362 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/38093/3
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38093 )
Change subject: mb/hp/8470p: Transform into variant ......................................................................
Patch Set 3: Code-Review+2
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38093 )
Change subject: mb/hp/8470p: Transform into variant ......................................................................
mb/hp/8470p: Transform into variant
Tested with BUILD_TIMELESS=1, binary does not change.
Change-Id: I6dbecb0b4d38ed4af8966f5391fce1f2c9c5d182 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38093 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de --- D src/mainboard/hp/8470p/Kconfig D src/mainboard/hp/8470p/Kconfig.name D src/mainboard/hp/8470p/Makefile.inc D src/mainboard/hp/8470p/acpi/ec.asl D src/mainboard/hp/8470p/acpi/platform.asl D src/mainboard/hp/8470p/acpi/superio.asl D src/mainboard/hp/8470p/acpi_tables.c D src/mainboard/hp/8470p/cmos.default D src/mainboard/hp/8470p/cmos.layout D src/mainboard/hp/8470p/dsdt.asl D src/mainboard/hp/8470p/mainboard.c M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig.name R src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt R src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb R src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads R src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c R src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c 19 files changed, 15 insertions(+), 362 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/src/mainboard/hp/8470p/Kconfig b/src/mainboard/hp/8470p/Kconfig deleted file mode 100644 index 24bedec..0000000 --- a/src/mainboard/hp/8470p/Kconfig +++ /dev/null @@ -1,61 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2017 Iru Cai mytbk920423@gmail.com -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# - -if BOARD_HP_8470P - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select BOARD_ROMSIZE_KB_16384 - select EC_HP_KBC1126 - select GFX_GMA_INTERNAL_IS_LVDS - select HAVE_ACPI_RESUME - select HAVE_ACPI_TABLES - select HAVE_CMOS_DEFAULT - select HAVE_OPTION_TABLE - select INTEL_INT15 - select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_USES_IFD_GBE_REGION - select NORTHBRIDGE_INTEL_SANDYBRIDGE - select SERIRQ_CONTINUOUS_MODE - select SOUTHBRIDGE_INTEL_C216 - select SUPERIO_SMSC_LPC47N217 - select SYSTEM_TYPE_LAPTOP - select USE_NATIVE_RAMINIT - -config MAINBOARD_DIR - string - default "hp/8470p" - -config MAINBOARD_PART_NUMBER - string - default "EliteBook 8470p" - -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - -config VGA_BIOS_ID - string - default "8086,0166" - -config MAX_CPUS - int - default 8 - -config USBDEBUG_HCD_INDEX - int - default 2 - -endif diff --git a/src/mainboard/hp/8470p/Kconfig.name b/src/mainboard/hp/8470p/Kconfig.name deleted file mode 100644 index 474da03..0000000 --- a/src/mainboard/hp/8470p/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_HP_8470P - bool "EliteBook 8470p" diff --git a/src/mainboard/hp/8470p/Makefile.inc b/src/mainboard/hp/8470p/Makefile.inc deleted file mode 100644 index 1d25875..0000000 --- a/src/mainboard/hp/8470p/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -bootblock-y += gpio.c -romstage-y += gpio.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads -bootblock-y += early_init.c -romstage-y += early_init.c diff --git a/src/mainboard/hp/8470p/acpi/ec.asl b/src/mainboard/hp/8470p/acpi/ec.asl deleted file mode 100644 index ac65fb3..0000000 --- a/src/mainboard/hp/8470p/acpi/ec.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Iru Cai mytbk920423@gmail.com - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <ec/hp/kbc1126/acpi/ec.asl> diff --git a/src/mainboard/hp/8470p/acpi/platform.asl b/src/mainboard/hp/8470p/acpi/platform.asl deleted file mode 100644 index fe0f936..0000000 --- a/src/mainboard/hp/8470p/acpi/platform.asl +++ /dev/null @@ -1,27 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011-2012 The Chromium OS Authors. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -Method(_WAK,1) -{ - _SB.PCI0.LPCB.EC0.ACPI = 1 - _SB.PCI0.LPCB.EC0.SLPT = 0 - - Return(Package(){0,0}) -} - -Method(_PTS,1) -{ - _SB.PCI0.LPCB.EC0.SLPT = Arg0 -} diff --git a/src/mainboard/hp/8470p/acpi/superio.asl b/src/mainboard/hp/8470p/acpi/superio.asl deleted file mode 100644 index b3ea115..0000000 --- a/src/mainboard/hp/8470p/acpi/superio.asl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <drivers/pc80/pc/ps2_controller.asl> diff --git a/src/mainboard/hp/8470p/acpi_tables.c b/src/mainboard/hp/8470p/acpi_tables.c deleted file mode 100644 index b278512..0000000 --- a/src/mainboard/hp/8470p/acpi_tables.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <southbridge/intel/bd82x6x/nvs.h> - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - // the lid is open by default. - gnvs->lids = 1; - - gnvs->tcrt = 100; - gnvs->tpsv = 90; -} diff --git a/src/mainboard/hp/8470p/cmos.default b/src/mainboard/hp/8470p/cmos.default deleted file mode 100644 index ba33ddf..0000000 --- a/src/mainboard/hp/8470p/cmos.default +++ /dev/null @@ -1,6 +0,0 @@ -boot_option=Fallback -debug_level=Debug -power_on_after_fail=Disable -nmi=Enable -volume=0x3 -sata_mode=AHCI diff --git a/src/mainboard/hp/8470p/cmos.layout b/src/mainboard/hp/8470p/cmos.layout deleted file mode 100644 index f1526f3..0000000 --- a/src/mainboard/hp/8470p/cmos.layout +++ /dev/null @@ -1,116 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## Copyright (C) 2014 Vladimir Serbinenko -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; version 2 of the License. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## - -# ----------------------------------------------------------------- -entries - -# ----------------------------------------------------------------- -# Status Register A -# ----------------------------------------------------------------- -# Status Register B -# ----------------------------------------------------------------- -# Status Register C -#96 4 r 0 status_c_rsvd -#100 1 r 0 uf_flag -#101 1 r 0 af_flag -#102 1 r 0 pf_flag -#103 1 r 0 irqf_flag -# ----------------------------------------------------------------- -# Status Register D -#104 7 r 0 status_d_rsvd -#111 1 r 0 valid_cmos_ram -# ----------------------------------------------------------------- -# Diagnostic Status Register -#112 8 r 0 diag_rsvd1 - -# ----------------------------------------------------------------- -0 120 r 0 reserved_memory -#120 264 r 0 unused - -# ----------------------------------------------------------------- -# RTC_BOOT_BYTE (coreboot hardcoded) -384 1 e 4 boot_option -388 4 h 0 reboot_counter -#390 2 r 0 unused? - -# ----------------------------------------------------------------- -# coreboot config options: console -#392 3 r 0 unused -395 4 e 6 debug_level -#399 1 r 0 unused - -#400 8 r 0 reserved for century byte - -# coreboot config options: southbridge -408 1 e 1 nmi -409 2 e 7 power_on_after_fail - -421 1 e 9 sata_mode - -# coreboot config options: cpu -#424 8 r 0 unused - -# coreboot config options: northbridge -432 3 e 11 gfx_uma_size -#435 5 r 0 unused - -440 8 h 0 volume - -# SandyBridge MRC Scrambler Seed values -896 32 r 0 mrc_scrambler_seed -928 32 r 0 mrc_scrambler_seed_s3 -960 16 r 0 mrc_scrambler_seed_chk - -# coreboot config options: check sums -984 16 h 0 check_sum - -# ----------------------------------------------------------------- - -enumerations - -#ID value text -1 0 Disable -1 1 Enable -2 0 Enable -2 1 Disable -4 0 Fallback -4 1 Normal -6 0 Emergency -6 1 Alert -6 2 Critical -6 3 Error -6 4 Warning -6 5 Notice -6 6 Info -6 7 Debug -6 8 Spew -7 0 Disable -7 1 Enable -7 2 Keep -9 0 AHCI -9 1 Compatible -11 0 32M -11 1 64M -11 2 96M -11 3 128M -11 4 160M -11 5 192M -11 6 224M - -# ----------------------------------------------------------------- -checksums - -checksum 392 447 984 diff --git a/src/mainboard/hp/8470p/dsdt.asl b/src/mainboard/hp/8470p/dsdt.asl deleted file mode 100644 index 81f45c1..0000000 --- a/src/mainboard/hp/8470p/dsdt.asl +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#define BRIGHTNESS_UP _SB.PCI0.GFX0.INCB -#define BRIGHTNESS_DOWN _SB.PCI0.GFX0.DECB -#define ACPI_VIDEO_DEVICE _SB.PCI0.GFX0 -#include <arch/acpi.h> -DefinitionBlock( - "dsdt.aml", - "DSDT", - 0x02, // DSDT revision: ACPI v2.0 and up - OEM_ID, - ACPI_TABLE_CREATOR, - 0x20141018 // OEM revision -) -{ - #include "acpi/platform.asl" - #include <cpu/intel/common/acpi/cpu.asl> - #include <southbridge/intel/common/acpi/platform.asl> - /* global NVS and variables. */ - #include <southbridge/intel/bd82x6x/acpi/globalnvs.asl> - #include <southbridge/intel/common/acpi/sleepstates.asl> - - Scope (_SB) { - Device (PCI0) - { - #include <northbridge/intel/sandybridge/acpi/sandybridge.asl> - #include <drivers/intel/gma/acpi/default_brightness_levels.asl> - #include <southbridge/intel/bd82x6x/acpi/pch.asl> - } - } -} diff --git a/src/mainboard/hp/8470p/mainboard.c b/src/mainboard/hp/8470p/mainboard.c deleted file mode 100644 index effba5e..0000000 --- a/src/mainboard/hp/8470p/mainboard.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2017 Iru Cai mytbk920423@gmail.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <device/device.h> -#include <drivers/intel/gma/int15.h> - -static void mainboard_enable(struct device *dev) -{ - install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, - GMA_INT15_PANEL_FIT_DEFAULT, - GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); -} - -struct chip_operations mainboard_ops = { - .enable_dev = mainboard_enable, -}; diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig index 30b83a7..f581b44 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig @@ -36,12 +36,14 @@ default "2570p" if BOARD_HP_2570P default "2760p" if BOARD_HP_2760P default "8460p" if BOARD_HP_8460P + default "8470p" if BOARD_HP_8470P
config MAINBOARD_PART_NUMBER string default "EliteBook 2570p" if BOARD_HP_2570P default "EliteBook 2760p" if BOARD_HP_2760P default "EliteBook 8460p" if BOARD_HP_8460P + default "EliteBook 8470p" if BOARD_HP_8470P
config DEVICETREE string @@ -66,5 +68,6 @@ default 2 if BOARD_HP_2570P default 1 if BOARD_HP_2760P default 1 if BOARD_HP_8460P + default 2 if BOARD_HP_8470P
endif diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name index 99dbe12..db5d71e 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig.name +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig.name @@ -48,3 +48,15 @@ select MAINBOARD_USES_IFD_GBE_REGION select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_SMSC_LPC47N217 + +config BOARD_HP_8470P + bool "EliteBook 8470p" + + select BOARD_HP_SNB_IVB_LAPTOPS + select BOARD_ROMSIZE_KB_16384 + select GFX_GMA_INTERNAL_IS_LVDS + select INTEL_INT15 + select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_USES_IFD_GBE_REGION + select SOUTHBRIDGE_INTEL_C216 + select SUPERIO_SMSC_LPC47N217 diff --git a/src/mainboard/hp/8470p/board_info.txt b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt similarity index 100% rename from src/mainboard/hp/8470p/board_info.txt rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/board_info.txt diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb similarity index 100% rename from src/mainboard/hp/8470p/devicetree.cb rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/devicetree.cb diff --git a/src/mainboard/hp/8470p/early_init.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c similarity index 100% rename from src/mainboard/hp/8470p/early_init.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/early_init.c diff --git a/src/mainboard/hp/8470p/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads similarity index 100% rename from src/mainboard/hp/8470p/gma-mainboard.ads rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/gma-mainboard.ads diff --git a/src/mainboard/hp/8470p/gpio.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c similarity index 100% rename from src/mainboard/hp/8470p/gpio.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/gpio.c diff --git a/src/mainboard/hp/8470p/hda_verb.c b/src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c similarity index 100% rename from src/mainboard/hp/8470p/hda_verb.c rename to src/mainboard/hp/snb_ivb_laptops/variants/8470p/hda_verb.c
-
Angel Pons (Code Review) -
Nico Huber (Code Review)