Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
nb/amd: Deduplicate nb_common.h
Save for the IO_APIC2_ADDR definition, they are equivalent.
Change-Id: I14da3d9aeefcc725428957ce0c9ac164eabacec6 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/pcengines/apu2/mptable.c M src/northbridge/amd/agesa/family14/northbridge.c M src/northbridge/amd/agesa/family15tn/northbridge.c M src/northbridge/amd/agesa/family16kb/northbridge.c D src/northbridge/amd/agesa/nb_common.h R src/northbridge/amd/nb_common.h M src/northbridge/amd/pi/00630F01/northbridge.c M src/northbridge/amd/pi/00660F01/northbridge.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/amd/pi/00730F01/state_machine.c 10 files changed, 8 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/47408/1
diff --git a/src/mainboard/pcengines/apu2/mptable.c b/src/mainboard/pcengines/apu2/mptable.c index b52c8cc..a24863f 100644 --- a/src/mainboard/pcengines/apu2/mptable.c +++ b/src/mainboard/pcengines/apu2/mptable.c @@ -3,7 +3,7 @@ #include <arch/smp/mpspec.h> #include <arch/ioapic.h> #include <stdint.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <southbridge/amd/common/amd_pci_util.h>
static void *smp_write_config_table(void *v) diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 7c37ff8..020c9c6 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -13,7 +13,7 @@ #include <cpu/cpu.h> #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <sb_cimx.h> diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 2d5234d..e345b50 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -18,7 +18,7 @@ #include <Porting.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index addd40f..b600bc9 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -18,7 +18,7 @@ #include <AGESA.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/agesa/nb_common.h b/src/northbridge/amd/agesa/nb_common.h deleted file mode 100644 index 66fbf92..0000000 --- a/src/northbridge/amd/agesa/nb_common.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __AMD_NB_COMMON_H__ -#define __AMD_NB_COMMON_H__ - -#define HT_IO_HOST_ALIGN 4096 -#define HT_MEM_HOST_ALIGN (1024 * 1024) - -#define DEV_CDB 0x18 - -#endif diff --git a/src/northbridge/amd/pi/nb_common.h b/src/northbridge/amd/nb_common.h similarity index 100% rename from src/northbridge/amd/pi/nb_common.h rename to src/northbridge/amd/nb_common.h diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 110dc84..5242cd0 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -17,7 +17,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h>
#define MAX_NODE_NUMS MAX_NODES diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c index 86c815c..7820c60 100644 --- a/src/northbridge/amd/pi/00660F01/northbridge.c +++ b/src/northbridge/amd/pi/00660F01/northbridge.c @@ -17,7 +17,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h>
#define MAX_NODE_NUMS MAX_NODES diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 41554b8..2019fae 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -21,7 +21,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <southbridge/amd/pi/hudson/pci_devs.h>
diff --git a/src/northbridge/amd/pi/00730F01/state_machine.c b/src/northbridge/amd/pi/00730F01/state_machine.c index af1198a..ba34dab 100644 --- a/src/northbridge/amd/pi/00730F01/state_machine.c +++ b/src/northbridge/amd/pi/00730F01/state_machine.c @@ -8,7 +8,7 @@ #include <device/device.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h>
void platform_BeforeInitReset(struct sysinfo *cb, AMD_RESET_PARAMS *Reset) {
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
Patch Set 1: Code-Review+1
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
Patch Set 1: Code-Review+2
Michał Żygowski has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
Patch Set 1: Code-Review+2
Hello build bot (Jenkins), Michał Żygowski, Paul Menzel, Arthur Heymans, Piotr Król,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/47408
to look at the new patch set (#2).
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
nb/amd: Deduplicate nb_common.h
Save for the IO_APIC2_ADDR definition, they are equivalent.
Change-Id: I14da3d9aeefcc725428957ce0c9ac164eabacec6 Signed-off-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/pcengines/apu2/mptable.c M src/northbridge/amd/agesa/family14/northbridge.c M src/northbridge/amd/agesa/family15tn/northbridge.c M src/northbridge/amd/agesa/family16kb/northbridge.c D src/northbridge/amd/agesa/nb_common.h R src/northbridge/amd/nb_common.h M src/northbridge/amd/pi/00630F01/northbridge.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/amd/pi/00730F01/state_machine.c 9 files changed, 7 insertions(+), 18 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/47408/2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47408 )
Change subject: nb/amd: Deduplicate nb_common.h ......................................................................
nb/amd: Deduplicate nb_common.h
Save for the IO_APIC2_ADDR definition, they are equivalent.
Change-Id: I14da3d9aeefcc725428957ce0c9ac164eabacec6 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/47408 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/pcengines/apu2/mptable.c M src/northbridge/amd/agesa/family14/northbridge.c M src/northbridge/amd/agesa/family15tn/northbridge.c M src/northbridge/amd/agesa/family16kb/northbridge.c D src/northbridge/amd/agesa/nb_common.h R src/northbridge/amd/nb_common.h M src/northbridge/amd/pi/00630F01/northbridge.c M src/northbridge/amd/pi/00730F01/northbridge.c M src/northbridge/amd/pi/00730F01/state_machine.c 9 files changed, 7 insertions(+), 18 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/mainboard/pcengines/apu2/mptable.c b/src/mainboard/pcengines/apu2/mptable.c index b52c8cc..a24863f 100644 --- a/src/mainboard/pcengines/apu2/mptable.c +++ b/src/mainboard/pcengines/apu2/mptable.c @@ -3,7 +3,7 @@ #include <arch/smp/mpspec.h> #include <arch/ioapic.h> #include <stdint.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <southbridge/amd/common/amd_pci_util.h>
static void *smp_write_config_table(void *v) diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 7c37ff8..020c9c6 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -13,7 +13,7 @@ #include <cpu/cpu.h> #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <sb_cimx.h> diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 2d5234d..e345b50 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -18,7 +18,7 @@ #include <Porting.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index addd40f..b600bc9 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -18,7 +18,7 @@ #include <AGESA.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h>
diff --git a/src/northbridge/amd/agesa/nb_common.h b/src/northbridge/amd/agesa/nb_common.h deleted file mode 100644 index 66fbf92..0000000 --- a/src/northbridge/amd/agesa/nb_common.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __AMD_NB_COMMON_H__ -#define __AMD_NB_COMMON_H__ - -#define HT_IO_HOST_ALIGN 4096 -#define HT_MEM_HOST_ALIGN (1024 * 1024) - -#define DEV_CDB 0x18 - -#endif diff --git a/src/northbridge/amd/pi/nb_common.h b/src/northbridge/amd/nb_common.h similarity index 100% rename from src/northbridge/amd/pi/nb_common.h rename to src/northbridge/amd/nb_common.h diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 110dc84..5242cd0 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -17,7 +17,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h>
#define MAX_NODE_NUMS MAX_NODES diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 41554b8..2019fae 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -21,7 +21,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <southbridge/amd/pi/hudson/pci_devs.h>
diff --git a/src/northbridge/amd/pi/00730F01/state_machine.c b/src/northbridge/amd/pi/00730F01/state_machine.c index af1198a..ba34dab 100644 --- a/src/northbridge/amd/pi/00730F01/state_machine.c +++ b/src/northbridge/amd/pi/00730F01/state_machine.c @@ -8,7 +8,7 @@ #include <device/device.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h>
void platform_BeforeInitReset(struct sysinfo *cb, AMD_RESET_PARAMS *Reset) {
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Michał Żygowski (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)