Skip to contentSkip to conversation

powerpc: Remove unused MPC8540/60ADS code

PATCH In review Tom Rini 4 participants 11 messages Feb 23, 2022 – Mar 4, 2022

Subsystems (6)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/4 powerpc: Remove unused MPC8540/60ADS code

Remove some code, primarily CPM2 related, that is now unused since the removal of MPC8540/60ADS.

Fixes 3913191c8a6b ("powerpc: mpc8540ads: mpc8560ads: Drop support for MPC8540/60ADS")

---
 arch/powerpc/cpu/mpc85xx/Makefile      |   2 -
 arch/powerpc/cpu/mpc85xx/commproc.c    | 188 ------
 arch/powerpc/cpu/mpc85xx/cpu.c         |   4 -
 arch/powerpc/cpu/mpc85xx/cpu_init.c    |  72 ---
 arch/powerpc/cpu/mpc85xx/fdt.c         |   8 -
 arch/powerpc/cpu/mpc85xx/serial_scc.c  | 262 --------
 arch/powerpc/cpu/mpc85xx/speed.c       |  16 -
 arch/powerpc/include/asm/cpm_85xx.h    | 824 -------------------------
 arch/powerpc/include/asm/global_data.h |  11 -
 arch/powerpc/include/asm/immap_85xx.h  | 327 ----------
 arch/powerpc/lib/bdinfo.c              |  13 -
 arch/powerpc/lib/bootm.c               |   6 -
 drivers/pci/pci_mpc85xx.c              |   1 -
 include/asm-generic/u-boot.h           |   6 -
 include/configs/MPC8540ADS.h           | 303 ---------
 include/configs/MPC8560ADS.h           | 292 ---------
 16 files changed, 2335 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc85xx/commproc.c
 delete mode 100644 arch/powerpc/cpu/mpc85xx/serial_scc.c
 delete mode 100644 arch/powerpc/include/asm/cpm_85xx.h
 delete mode 100644 include/configs/MPC8540ADS.h
 delete mode 100644 include/configs/MPC8560ADS.h
arch/powerpc/cpu/mpc85xx/Makefile +0 -2
index 6f4ad1f9b762..c32cde04e16a 100644
@@ -27,7 +27,6 @@ obj-$(CONFIG_MP)	+= release.o
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_CMD_ERRATA) += cmd_errata.o
 endif
-obj-$(CONFIG_CPM2)	+= commproc.o
 
 obj-$(CONFIG_OF_LIBFDT) += fdt.o
 obj-$(CONFIG_FSL_CORENET) += liodn.o
@@ -49,7 +48,6 @@ obj-$(CONFIG_ARCH_T2080) += t2080_ids.o
 
 
 obj-$(CONFIG_QE)	+= qe_io.o
-obj-$(CONFIG_CPM2)	+= serial_scc.o
 obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS1) += fsl_corenet_serdes.o
 obj-$(CONFIG_SYS_FSL_QORIQ_CHASSIS2) += fsl_corenet2_serdes.o
 
arch/powerpc/cpu/mpc85xx/commproc.c deleted +0 -188

188 lines not on this page · raw message

arch/powerpc/cpu/mpc85xx/cpu.c +0 -4
index cd32290410f6..cc1d02df8115 100644
@@ -241,10 +241,6 @@ int checkcpu (void)
 	printf("IFC:%-4s MHz\n", strmhz(buf1, sysinfo.freq_localbus));
 #endif
 
-#ifdef CONFIG_CPM2
-	printf("CPM:   %s MHz\n", strmhz(buf1, sysinfo.freq_systembus));
-#endif
-
 #ifdef CONFIG_QE
 	printf("       QE:%-4s MHz\n", strmhz(buf1, sysinfo.freq_qe));
 #endif
arch/powerpc/cpu/mpc85xx/cpu_init.c +0 -72

86 lines not on this page · raw message

arch/powerpc/cpu/mpc85xx/fdt.c +0 -8
index d4b828e3824c..c8ad6a1b01ce 100644
@@ -652,14 +652,6 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 		"clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
 #endif
 
-#ifdef CONFIG_CPM2
-	do_fixup_by_compat_u32(blob, "fsl,cpm2-scc-uart",
-		"current-speed", gd->baudrate, 1);
-
-	do_fixup_by_compat_u32(blob, "fsl,cpm2-brg",
-		"clock-frequency", bd->bi_brgfreq, 1);
-#endif
-
 #ifdef CONFIG_FSL_CORENET
 	do_fixup_by_compat_u32(blob, "fsl,qoriq-clockgen-1.0",
 		"clock-frequency", get_board_sys_clk(), 1);
arch/powerpc/cpu/mpc85xx/serial_scc.c deleted +0 -262

262 lines not on this page · raw message

arch/powerpc/cpu/mpc85xx/speed.c +0 -16
index 5a9cd281617b..4b6f3d28baa6 100644
@@ -580,15 +580,6 @@ int get_clocks(void)
 	sys_info_t sys_info;
 #ifdef CONFIG_ARCH_MPC8544
 	volatile ccsr_gur_t *gur = (void *) CONFIG_SYS_MPC85xx_GUTS_ADDR;
-#endif
-#if defined(CONFIG_CPM2)
-	volatile ccsr_cpm_t *cpm = (ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADDR;
-	uint sccr, dfbrg;
-
-	/* set VCO = 4 * BRG */
-	cpm->im_cpm_intctl.sccr &= 0xfffffffc;
-	sccr = cpm->im_cpm_intctl.sccr;
-	dfbrg = (sccr & SCCR_DFBRG_MSK) >> SCCR_DFBRG_SHIFT;
 #endif
 	get_sys_info (&sys_info);
 	gd->cpu_clk = sys_info.freq_processor[0];
@@ -635,13 +626,6 @@ int get_clocks(void)
 #endif
 #endif /* defined(CONFIG_FSL_ESDHC) */
 
-#if defined(CONFIG_CPM2)
-	gd->arch.vco_out = 2*sys_info.freq_systembus;
-	gd->arch.cpm_clk = gd->arch.vco_out / 2;
-	gd->arch.scc_clk = gd->arch.vco_out / 4;
-	gd->arch.brg_clk = gd->arch.vco_out / (1 << (2 * (dfbrg + 1)));
-#endif
-
 	if(gd->cpu_clk != 0) return (0);
 	else return (1);
 }
arch/powerpc/include/asm/cpm_85xx.h deleted +0 -824

824 lines not on this page · raw message

arch/powerpc/include/asm/global_data.h +0 -11
index 2975255bfe23..770adcd30f29 100644
@@ -19,13 +19,6 @@ struct arch_global_data {
 #endif
 #if defined(CONFIG_MPC8xx)
 	unsigned long brg_clk;
-#endif
-#if defined(CONFIG_CPM2)
-	/* There are many clocks on the MPC8260 - see page 9-5 */
-	unsigned long vco_out;
-	unsigned long cpm_clk;
-	unsigned long scc_clk;
-	unsigned long brg_clk;
 #endif
 	/* TODO: [email protected]: Should these be unslgned long? */
 #if defined(CONFIG_MPC83xx)
@@ -88,10 +81,6 @@ struct arch_global_data {
 	unsigned long arbiter_event_attributes;
 	unsigned long arbiter_event_address;
 #endif
-#if defined(CONFIG_CPM2)
-	unsigned int dp_alloc_base;
-	unsigned int dp_alloc_top;
-#endif
 #ifdef CONFIG_SYS_FPGA_COUNT
 	unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
 #endif
arch/powerpc/include/asm/immap_85xx.h +0 -327

345 lines not on this page · raw message

arch/powerpc/lib/bdinfo.c +0 -13
index d2e5e6057b34..55dcad5df8e9 100644
@@ -27,13 +27,6 @@ int arch_setup_bdinfo(void)
 	bd->bi_intfreq = gd->cpu_clk;	/* Internal Freq, in Hz */
 	bd->bi_busfreq = gd->bus_clk;	/* Bus Freq,      in Hz */
 
-#if defined(CONFIG_CPM2)
-	bd->bi_cpmfreq = gd->arch.cpm_clk;
-	bd->bi_brgfreq = gd->arch.brg_clk;
-	bd->bi_sccfreq = gd->arch.scc_clk;
-	bd->bi_vco = gd->arch.vco_out;
-#endif /* CONFIG_CPM2 */
-
 	return 0;
 }
 
@@ -59,10 +52,4 @@ void arch_print_bdinfo(void)
 		puts("addressing  = 32-bit\n");
 #endif
 	board_detail();
-#if defined(CONFIG_CPM2)
-	bdinfo_print_mhz("cpmfreq", bd->bi_cpmfreq);
-	bdinfo_print_mhz("vco", bd->bi_vco);
-	bdinfo_print_mhz("sccfreq", bd->bi_sccfreq);
-	bdinfo_print_mhz("brgfreq", bd->bi_brgfreq);
-#endif
 }
arch/powerpc/lib/bootm.c +0 -6
index 8d65047aa4d4..3b43066bb4f2 100644
@@ -266,12 +266,6 @@ static void set_clocks_in_mhz (struct bd_info *kbd)
 		/* convert all clock information to MHz */
 		kbd->bi_intfreq /= 1000000L;
 		kbd->bi_busfreq /= 1000000L;
-#if defined(CONFIG_CPM2)
-		kbd->bi_cpmfreq /= 1000000L;
-		kbd->bi_brgfreq /= 1000000L;
-		kbd->bi_sccfreq /= 1000000L;
-		kbd->bi_vco	/= 1000000L;
-#endif
 	}
 }
 
drivers/pci/pci_mpc85xx.c +0 -1
index 1e180ee289b0..8a81a74067e9 100644
@@ -6,7 +6,6 @@
  */
 #include <common.h>
 #include <asm/bitops.h>
-#include <asm/cpm_85xx.h>
 #include <pci.h>
 #include <dm.h>
 #include <asm/fsl_law.h>
include/asm-generic/u-boot.h +0 -6
index 637de0c4558a..1becc669aee9 100644
@@ -52,12 +52,6 @@ struct bd_info {
 	unsigned short	bi_ethspeed;	/* Ethernet speed in Mbps */
 	unsigned long	bi_intfreq;	/* Internal Freq, in MHz */
 	unsigned long	bi_busfreq;	/* Bus Freq, in MHz */
-#if defined(CONFIG_CPM2)
-	unsigned long	bi_cpmfreq;	/* CPM_CLK Freq, in MHz */
-	unsigned long	bi_brgfreq;	/* BRG_CLK Freq, in MHz */
-	unsigned long	bi_sccfreq;	/* SCC_CLK Freq, in MHz */
-	unsigned long	bi_vco;		/* VCO Out from PLL, in MHz */
-#endif
 #if defined(CONFIG_M68K)
 	unsigned long	bi_pcifreq;	/* PCI Bus Freq, in MHz */
 #endif
include/configs/MPC8540ADS.h deleted +0 -303

303 lines not on this page · raw message

include/configs/MPC8560ADS.h deleted +0 -292

292 lines not on this page · raw message

Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 2/4 Convert CONFIG_BTB to Kconfig

This converts the following to Kconfig:
CONFIG_BTB

---
 arch/powerpc/cpu/mpc85xx/Kconfig | 10 ++++++++++
 include/configs/MPC8548CDS.h     |  1 -
 include/configs/P1010RDB.h       |  1 -
 include/configs/P2041RDB.h       |  1 -
 include/configs/T102xRDB.h       |  1 -
 include/configs/T104xRDB.h       |  1 -
 include/configs/T208xQDS.h       |  1 -
 include/configs/T208xRDB.h       |  1 -
 include/configs/T4240RDB.h       |  1 -
 include/configs/corenet_ds.h     |  1 -
 include/configs/kmcent2.h        |  1 -
 include/configs/p1_p2_rdb_pc.h   |  1 -
 include/configs/socrates.h       |  1 -
 13 files changed, 10 insertions(+), 12 deletions(-)
arch/powerpc/cpu/mpc85xx/Kconfig +10 -0
index c308447d493a..a978eea1617a 100644
@@ -317,6 +317,7 @@ config ARCH_MPC8540
 
 config ARCH_MPC8544
 	bool
+	select BTB
 	select FSL_LAW
 	select SYS_CACHE_SHIFT_5
 	select SYS_FSL_ERRATUM_A005125
@@ -330,6 +331,7 @@ config ARCH_MPC8544
 
 config ARCH_MPC8548
 	bool
+	select BTB
 	select FSL_LAW
 	select SYS_FSL_ERRATUM_A005125
 	select SYS_FSL_ERRATUM_NMG_DDR120
@@ -352,6 +354,7 @@ config ARCH_MPC8560
 
 config ARCH_P1010
 	bool
+	select BTB
 	select FSL_LAW
 	select SYS_CACHE_SHIFT_5
 	select SYS_HAS_SERDES
@@ -400,6 +403,7 @@ config ARCH_P1011
 
 config ARCH_P1020
 	bool
+	select BTB
 	select FSL_LAW
 	select SYS_CACHE_SHIFT_5
 	select SYS_FSL_ERRATUM_A004508
@@ -496,6 +500,7 @@ config ARCH_P1025
 
 config ARCH_P2020
 	bool
+	select BTB
 	select FSL_LAW
 	select SYS_CACHE_SHIFT_5
 	select SYS_FSL_ERRATUM_A004477
@@ -772,6 +777,9 @@ config MPC85XX_HAVE_RESET_VECTOR
 	bool "Indicate reset vector at CONFIG_RESET_VECTOR_ADDRESS - 0xffc"
 	depends on MPC85xx
 
+config BTB
+	bool "toggle branch predition"
+
 config BOOKE
 	bool
 	default y
@@ -784,12 +792,14 @@ config E500
 
 config E500MC
 	bool
+	select BTB
 	imply CMD_PCI
 	help
 		Enble PowerPC E500MC core
 
 config E6500
 	bool
+	select BTB
 	help
 		Enable PowerPC E6500 core
 
include/configs/MPC8548CDS.h +0 -1
index e16d870a5e66..b5430c950d03 100644
@@ -30,7 +30,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_L2_CACHE			/* toggle L2 cache */
-#define CONFIG_BTB			/* toggle branch predition */
 
 /*
  * Only possible on E500 Version 2 or newer cores.
include/configs/P1010RDB.h +0 -1
index 106d1e6a4b7e..827edf484b76 100644
@@ -151,7 +151,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_L2_CACHE			/* toggle L2 cache */
-#define CONFIG_BTB			/* toggle branch predition */
 
 
 #define CONFIG_ENABLE_36BIT_PHYS
include/configs/P2041RDB.h +0 -1
index e6d5321070bf..027f1479319d 100644
@@ -58,7 +58,6 @@
 #define CONFIG_SYS_CACHE_STASHING
 #define CONFIG_BACKSIDE_L2_CACHE
 #define CONFIG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#define CONFIG_BTB			/* toggle branch predition */
 
 #define CONFIG_ENABLE_36BIT_PHYS
 
include/configs/T102xRDB.h +0 -1
index d24cfce8b3b9..2fe53bf6be9f 100644
@@ -121,7 +121,6 @@
 #define CONFIG_SYS_CACHE_STASHING
 #define CONFIG_BACKSIDE_L2_CACHE
 #define CONFIG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#define CONFIG_BTB			/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/T104xRDB.h +0 -1
index 9433f14227bb..2c4ede960ec1 100644
@@ -98,7 +98,6 @@
 #define CONFIG_SYS_CACHE_STASHING
 #define CONFIG_BACKSIDE_L2_CACHE
 #define CONFIG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#define CONFIG_BTB			/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/T208xQDS.h +0 -1
index a41f9f0d9b83..3fcab6a0213c 100644
@@ -88,7 +88,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_SYS_CACHE_STASHING
-#define CONFIG_BTB		/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/T208xRDB.h +0 -1
index 7165ba082833..8a725cd1f78f 100644
@@ -83,7 +83,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_SYS_CACHE_STASHING
-#define CONFIG_BTB		/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/T4240RDB.h +0 -1
index daccd816c104..441ff18441a6 100644
@@ -65,7 +65,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_SYS_CACHE_STASHING
-#define CONFIG_BTB			/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/corenet_ds.h +0 -1
index bd264122da76..79c90a7addb8 100644
@@ -59,7 +59,6 @@
 #define CONFIG_SYS_CACHE_STASHING
 #define CONFIG_BACKSIDE_L2_CACHE
 #define CONFIG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#define CONFIG_BTB			/* toggle branch predition */
 #ifdef CONFIG_DDR_ECC
 #define CONFIG_MEM_INIT_VALUE		0xdeadbeef
 #endif
include/configs/kmcent2.h +0 -1
index ca0cb31c2964..52a5ff9382ed 100644
@@ -152,7 +152,6 @@
 #define CONFIG_SYS_CACHE_STASHING
 #define CONFIG_BACKSIDE_L2_CACHE
 #define CONFIG_SYS_INIT_L2CSR0		L2CSR0_L2E
-#define CONFIG_BTB			/* toggle branch predition */
 
 #define CONFIG_ENABLE_36BIT_PHYS
 
include/configs/p1_p2_rdb_pc.h +0 -1
index 92008cd38e49..549adf04b62d 100644
@@ -145,7 +145,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_L2_CACHE
-#define CONFIG_BTB
 
 #define CONFIG_ENABLE_36BIT_PHYS
 
include/configs/socrates.h +0 -1
index a51a162ee044..4eb19b0e3e3f 100644
@@ -42,7 +42,6 @@
  * These can be toggled for performance analysis, otherwise use default.
  */
 #define CONFIG_L2_CACHE			/* toggle L2 cache		*/
-#define CONFIG_BTB			/* toggle branch predition	*/
 
 #define CONFIG_SYS_INIT_DBCR DBCR_IDM		/* Enable Debug Exceptions	*/
 
Signature · 1 line
2.25.1
author
#2 lore raw

Re: [PATCH 2/4] Convert CONFIG_BTB to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BTB

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
author
#3 lore raw

PATCH 3/4 arm: exynos: Move BL1/2 SPI flash defines to their user, drop CONFIG

In reply to Tom Rini

These particular values are not configurable and today we always set CONFIG_SECURE_BL1_ONLY. Move these to where they're used in the code, and drop from the CONFIG namespace.

Cc Minkyu Kang <[email protected]>
Cc Jaehoon Chung <[email protected]>
---
 arch/arm/mach-exynos/spl_boot.c  | 30 ++++++++++++++++++++++++++++++
 include/configs/exynos5-common.h | 24 ------------------------
 include/configs/origen.h         |  5 -----
 include/configs/smdkv310.h       |  5 -----
 4 files changed, 30 insertions(+), 34 deletions(-)
arch/arm/mach-exynos/spl_boot.c +30 -0
index 722449881af2..93fea9c749a6 100644
@@ -22,6 +22,36 @@
 #include "common_setup.h"
 #include "clock_init.h"
 
+#ifdef CONFIG_ARCH_EXYNOS5
+#define SECURE_BL1_ONLY
+
+/* Secure FW size configuration */
+#ifdef SECURE_BL1_ONLY
+#define SEC_FW_SIZE (8 << 10) /* 8KB */
+#else
+#define SEC_FW_SIZE 0
+#endif
+
+/* Configuration of BL1, BL2, ENV Blocks on mmc */
+#define RES_BLOCK_SIZE	(512)
+#define BL1_SIZE	(16 << 10) /*16 K reserved for BL1*/
+#define BL2_SIZE	(512UL << 10UL) /* 512 KB */
+
+#define BL1_OFFSET	(RES_BLOCK_SIZE + SEC_FW_SIZE)
+#define BL2_OFFSET	(BL1_OFFSET + BL1_SIZE)
+
+/* U-Boot copy size from boot Media to DRAM.*/
+#define BL2_START_OFFSET	(BL2_OFFSET/512)
+#define BL2_SIZE_BLOC_COUNT	(BL2_SIZE/512)
+
+#define EXYNOS_COPY_SPI_FNPTR_ADDR	0x02020058
+#define SPI_FLASH_UBOOT_POS	(SEC_FW_SIZE + BL1_SIZE)
+#elif defined(CONFIG_ARCH_EXYNOS4)
+#define COPY_BL2_SIZE		0x80000
+#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
+#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Index into irom ptr table */
include/configs/exynos5-common.h +0 -24
index 90d095d535b0..410243bb2c91 100644
@@ -58,30 +58,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE	0x00000000
 
-#define CONFIG_SECURE_BL1_ONLY
-
-/* Secure FW size configuration */
-#ifdef CONFIG_SECURE_BL1_ONLY
-#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
-#else
-#define CONFIG_SEC_FW_SIZE 0
-#endif
-
-/* Configuration of BL1, BL2, ENV Blocks on mmc */
-#define CONFIG_RES_BLOCK_SIZE	(512)
-#define CONFIG_BL1_SIZE	(16 << 10) /*16 K reserved for BL1*/
-#define CONFIG_BL2_SIZE	(512UL << 10UL) /* 512 KB */
-
-#define CONFIG_BL1_OFFSET	(CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
-#define CONFIG_BL2_OFFSET	(CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
-
-/* U-Boot copy size from boot Media to DRAM.*/
-#define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
-#define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
-
-#define EXYNOS_COPY_SPI_FNPTR_ADDR	0x02020058
-#define SPI_FLASH_UBOOT_POS	(CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
-
 /* SPI */
 
 /* Ethernet Controllor Driver */
include/configs/origen.h +0 -5
index 1caeed6ba5cd..22325180ce0e 100644
@@ -58,9 +58,4 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-Boot copy size from boot Media to DRAM.*/
-#define COPY_BL2_SIZE		0x80000
-#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
-#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
-
 #endif	/* __CONFIG_H */
include/configs/smdkv310.h +0 -5
index f113fa44045e..32196a5aef94 100644
@@ -51,11 +51,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-Boot copy size from boot Media to DRAM.*/
-#define	COPY_BL2_SIZE		0x80000
-#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
-#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
-
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_ENV_SROM_BANK		1
Signature · 1 line
2.25.1
Reviewed-by on v1 3/4
#4 lore raw

Re: [PATCH 3/4] arm: exynos: Move BL1/2 SPI flash defines to their user, drop CONFIG

Quoted 7 lines · Tom Rini

These particular values are not configurable and today we always set CONFIG_SECURE_BL1_ONLY. Move these to where they're used in the code, and drop from the CONFIG namespace.

Cc Minkyu Kang <[email protected]>
Cc Jaehoon Chung <[email protected]>

Best Regards,
Jaehoon Chung

Quoted 113 lines
---
 arch/arm/mach-exynos/spl_boot.c  | 30 ++++++++++++++++++++++++++++++
 include/configs/exynos5-common.h | 24 ------------------------
 include/configs/origen.h         |  5 -----
 include/configs/smdkv310.h       |  5 -----
 4 files changed, 30 insertions(+), 34 deletions(-)
arch/arm/mach-exynos/spl_boot.c +30 -0
index 722449881af2..93fea9c749a6 100644
@@ -22,6 +22,36 @@
 #include "common_setup.h"
 #include "clock_init.h"
 
+#ifdef CONFIG_ARCH_EXYNOS5
+#define SECURE_BL1_ONLY
+
+/* Secure FW size configuration */
+#ifdef SECURE_BL1_ONLY
+#define SEC_FW_SIZE (8 << 10) /* 8KB */
+#else
+#define SEC_FW_SIZE 0
+#endif
+
+/* Configuration of BL1, BL2, ENV Blocks on mmc */
+#define RES_BLOCK_SIZE	(512)
+#define BL1_SIZE	(16 << 10) /*16 K reserved for BL1*/
+#define BL2_SIZE	(512UL << 10UL) /* 512 KB */
+
+#define BL1_OFFSET	(RES_BLOCK_SIZE + SEC_FW_SIZE)
+#define BL2_OFFSET	(BL1_OFFSET + BL1_SIZE)
+
+/* U-Boot copy size from boot Media to DRAM.*/
+#define BL2_START_OFFSET	(BL2_OFFSET/512)
+#define BL2_SIZE_BLOC_COUNT	(BL2_SIZE/512)
+
+#define EXYNOS_COPY_SPI_FNPTR_ADDR	0x02020058
+#define SPI_FLASH_UBOOT_POS	(SEC_FW_SIZE + BL1_SIZE)
+#elif defined(CONFIG_ARCH_EXYNOS4)
+#define COPY_BL2_SIZE		0x80000
+#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
+#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
+#endif
+
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Index into irom ptr table */
include/configs/exynos5-common.h +0 -24
index 90d095d535b0..410243bb2c91 100644
@@ -58,30 +58,6 @@
 
 #define CONFIG_SYS_MONITOR_BASE	0x00000000
 
-#define CONFIG_SECURE_BL1_ONLY
-
-/* Secure FW size configuration */
-#ifdef CONFIG_SECURE_BL1_ONLY
-#define CONFIG_SEC_FW_SIZE (8 << 10) /* 8KB */
-#else
-#define CONFIG_SEC_FW_SIZE 0
-#endif
-
-/* Configuration of BL1, BL2, ENV Blocks on mmc */
-#define CONFIG_RES_BLOCK_SIZE	(512)
-#define CONFIG_BL1_SIZE	(16 << 10) /*16 K reserved for BL1*/
-#define CONFIG_BL2_SIZE	(512UL << 10UL) /* 512 KB */
-
-#define CONFIG_BL1_OFFSET	(CONFIG_RES_BLOCK_SIZE + CONFIG_SEC_FW_SIZE)
-#define CONFIG_BL2_OFFSET	(CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)
-
-/* U-Boot copy size from boot Media to DRAM.*/
-#define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512)
-#define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)
-
-#define EXYNOS_COPY_SPI_FNPTR_ADDR	0x02020058
-#define SPI_FLASH_UBOOT_POS	(CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE)
-
 /* SPI */
 
 /* Ethernet Controllor Driver */
include/configs/origen.h +0 -5
index 1caeed6ba5cd..22325180ce0e 100644
@@ -58,9 +58,4 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-Boot copy size from boot Media to DRAM.*/
-#define COPY_BL2_SIZE		0x80000
-#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
-#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
-
 #endif	/* __CONFIG_H */
include/configs/smdkv310.h +0 -5
index f113fa44045e..32196a5aef94 100644
@@ -51,11 +51,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR		0x02040000
 
-/* U-Boot copy size from boot Media to DRAM.*/
-#define	COPY_BL2_SIZE		0x80000
-#define BL2_START_OFFSET	((CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)/512)
-#define BL2_SIZE_BLOC_COUNT	(COPY_BL2_SIZE/512)
-
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_ENV_SROM_BANK		1
Reviewed-by
#5 lore raw

Re: [PATCH 3/4] arm: exynos: Move BL1/2 SPI flash defines to their user, drop CONFIG

Dear Tom,

2022년 2월 24일 (목) 09:03, Jaehoon Chung <[email protected]>님이 작성:

Quoted 5 lines · Tom Rini
Quoted 4 lines

These particular values are not configurable and today we always set CONFIG_SECURE_BL1_ONLY. Move these to where they're used in the code, and drop from the CONFIG namespace.

Quoted 9 lines
Quoted 3 lines
Cc Minkyu Kang <[email protected]>
Cc Jaehoon Chung <[email protected]>

Best Regards,
Jaehoon Chung

Thanks.

Signature · 1 line
Thanks. Minkyu Kang.
author
#6 lore raw

Re: [PATCH 3/4] arm: exynos: Move BL1/2 SPI flash defines to their user, drop CONFIG

In reply to Tom Rini
Quoted 9 lines · Tom Rini

These particular values are not configurable and today we always set CONFIG_SECURE_BL1_ONLY. Move these to where they're used in the code, and drop from the CONFIG namespace.

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
author
#7 lore raw

PATCH 4/4 Convert CONFIG_BOARD_COMMON to Kconfig

In reply to Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_COMMON

---
 arch/arm/mach-exynos/Kconfig        | 4 ++++
 include/configs/espresso7420.h      | 2 --
 include/configs/exynos4-common.h    | 2 --
 include/configs/exynos5-dt-common.h | 2 --
 include/configs/exynos78x0-common.h | 2 --
 include/configs/odroid_xu3.h        | 2 --
 include/configs/smdk5250.h          | 2 --
 include/configs/smdk5420.h          | 2 --
 include/configs/smdkv310.h          | 1 -
 include/configs/snow.h              | 2 --
 include/configs/spring.h            | 2 --
 scripts/config_whitelist.txt        | 1 -
 12 files changed, 4 insertions(+), 20 deletions(-)
arch/arm/mach-exynos/Kconfig +4 -0
index 6087d93c71a4..f73dbbb507d1 100644
@@ -1,5 +1,9 @@
 if ARCH_EXYNOS
 
+config BOARD_COMMON
+	def_bool y
+	depends on !TARGET_SMDKV310 && !TARGET_ARNDALE
+
 choice
 	prompt "EXYNOS architecture type select"
 	optional
include/configs/espresso7420.h +0 -2
index 2495db93f8d4..d936b7f09fcd 100644
@@ -10,8 +10,6 @@
 
 #include <configs/exynos7420-common.h>
 
-#define CONFIG_BOARD_COMMON
-
 #define CONFIG_ESPRESSO7420
 
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
include/configs/exynos4-common.h +0 -2
index 52dcf7a3bc42..4202c6261262 100644
@@ -12,8 +12,6 @@
 
 #include "exynos-common.h"
 
-#define CONFIG_BOARD_COMMON
-
 /* SD/MMC configuration */
 #define CONFIG_MMC_DEFAULT_DEV	0
 
include/configs/exynos5-dt-common.h +0 -2
index 00b67787d9e6..bcbdfa7ae35a 100644
@@ -21,8 +21,6 @@
 #define FLASH_SIZE		(4 << 20)
 #define CONFIG_SPI_BOOTING
 
-#define CONFIG_BOARD_COMMON
-
 /* Display */
 #ifdef CONFIG_LCD
 #define CONFIG_EXYNOS_FB
include/configs/exynos78x0-common.h +0 -2
index 8d3449f028c3..6b1df63dc32f 100644
@@ -36,8 +36,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{9600, 19200, 38400, 57600, 115200, 230400, 460800, 921600}
 
-#define CONFIG_BOARD_COMMON
-
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_TEXT_BASE + SZ_2M - GENERATED_GBL_DATA_SIZE)
 /* DRAM Memory Banks */
include/configs/odroid_xu3.h +0 -2
index a4825982a898..616f25eafd3e 100644
@@ -10,8 +10,6 @@
 #include <configs/exynos5420-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_BOARD_COMMON
-
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 
 #define TZPC_BASE_OFFSET		0x10000
include/configs/smdk5250.h +0 -2
index d7e86f2f7644..1ea3b650cd26 100644
@@ -15,6 +15,4 @@
 #undef CONFIG_EXYNOS_FB
 #undef CONFIG_EXYNOS_DP
 
-#define CONFIG_BOARD_COMMON
-
 #endif	/* __CONFIG_SMDK_H */
include/configs/smdk5420.h +0 -2
index 38691b63dafe..f26995d5c1c9 100644
@@ -15,8 +15,6 @@
 #undef CONFIG_EXYNOS_FB
 #undef CONFIG_EXYNOS_DP
 
-#define CONFIG_BOARD_COMMON
-
 #define CONFIG_SMDK5420			/* which is in a SMDK5420 */
 
 #define CONFIG_SYS_SDRAM_BASE	0x20000000
include/configs/smdkv310.h +0 -1
index 32196a5aef94..84b8537e54df 100644
@@ -10,7 +10,6 @@
 
 #include "exynos4-common.h"
 
-#undef CONFIG_BOARD_COMMON
 #undef CONFIG_USB_GADGET_DWC2_OTG_PHY
 
 /* High Level Configuration Options */
include/configs/snow.h +0 -2
index c082b2d82d86..00d9b4d41673 100644
@@ -15,6 +15,4 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_BOARD_COMMON
-
 #endif	/* __CONFIG_SNOW_H */
include/configs/spring.h +0 -2
index 0b052453a51c..2f0a5807be0d 100644
@@ -10,6 +10,4 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#define CONFIG_BOARD_COMMON
-
 #endif	/* __CONFIG_SPRING_H */
scripts/config_whitelist.txt +0 -1
index a6bc234f51ed..1e78d266aed4 100644
@@ -37,7 +37,6 @@ CONFIG_BL2_OFFSET
 CONFIG_BL2_SIZE
 CONFIG_BOARDDIR
 CONFIG_BOARDNAME
-CONFIG_BOARD_COMMON
 CONFIG_BOARD_ECC_SUPPORT
 CONFIG_BOARD_NAME
 CONFIG_BOARD_POSTCLK_INIT
Signature · 1 line
2.25.1
author
#8 lore raw

Re: [PATCH 4/4] Convert CONFIG_BOARD_COMMON to Kconfig

Quoted 4 lines · Tom Rini

This converts the following to Kconfig:
CONFIG_BOARD_COMMON

Applied to u-boot/next, thanks!

Signature · 1 line
Tom
Reviewed-by on v1 1/4
#9 lore raw
In reply to Tom Rini
Quoted 21 lines · Tom Rini

Remove some code, primarily CPM2 related, that is now unused since the removal of MPC8540/60ADS.

Fixes 3913191c8a6b ("powerpc: mpc8540ads: mpc8560ads: Drop support for MPC8540/60ADS")

---
 arch/powerpc/cpu/mpc85xx/Makefile      |   2 -
 arch/powerpc/cpu/mpc85xx/commproc.c    | 188 ------
 arch/powerpc/cpu/mpc85xx/cpu.c         |   4 -
 arch/powerpc/cpu/mpc85xx/cpu_init.c    |  72 ---
 arch/powerpc/cpu/mpc85xx/fdt.c         |   8 -
 arch/powerpc/cpu/mpc85xx/serial_scc.c  | 262 --------
 arch/powerpc/cpu/mpc85xx/speed.c       |  16 -
 arch/powerpc/include/asm/cpm_85xx.h    | 824 -------------------------
 arch/powerpc/include/asm/global_data.h |  11 -
 arch/powerpc/include/asm/immap_85xx.h  | 327 ----------
 arch/powerpc/lib/bdinfo.c              |  13 -
 arch/powerpc/lib/bootm.c               |   6 -
 drivers/pci/pci_mpc85xx.c              |   1 -
 include/asm-generic/u-boot.h           |   6 -
Quoted 8 lines
 include/configs/MPC8540ADS.h           | 303 ---------
 include/configs/MPC8560ADS.h           | 292 ---------
 16 files changed, 2335 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc85xx/commproc.c
 delete mode 100644 arch/powerpc/cpu/mpc85xx/serial_scc.c
 delete mode 100644 arch/powerpc/include/asm/cpm_85xx.h
 delete mode 100644 include/configs/MPC8540ADS.h
 delete mode 100644 include/configs/MPC8560ADS.h