Skip to contentSkip to conversation

arm: socfpga: clean up socfpga_common.h

PATCH Superseded Simon Goldschmidt 2 participants 8 messages Apr 22, 2019

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover arm: socfpga: clean up socfpga_common.h

This series cleans up the include/configs/socfpga_common.h file a bit.

It removes some defines that are used nowhere and cleans up some leftovers after various subsystems have been converted to use DM.

Changes in v3:
- changed commit message of 2/4: s/defines/macros and comments/

Changes in v2:
- added (this) patch to move socfpga_vining to DM_I2C
- remove even more outdated things
- added (this) patch with further cleanups to the socfpga board config files

Simon Goldschmidt (4):
arm: socfpga: move vining_fpga to DM_I2C
arm: socfpga: clean up socfpga_common.h
arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ
arm: socfpga: clean up board config files

 configs/socfpga_vining_fpga_defconfig    |  8 ++-
 include/configs/socfpga_arria10_socdk.h  |  6 ---
 include/configs/socfpga_arria5_socdk.h   |  2 -
 include/configs/socfpga_common.h         | 68 ------------------------
 include/configs/socfpga_cyclone5_socdk.h |  2 -
 include/configs/socfpga_de0_nano_soc.h   |  2 -
 include/configs/socfpga_de10_nano.h      |  2 -
 include/configs/socfpga_de1_soc.h        |  2 -
 include/configs/socfpga_is1.h            |  2 -
 include/configs/socfpga_sockit.h         |  2 -
 include/configs/socfpga_socrates.h       |  2 -
 include/configs/socfpga_sr1500.h         | 11 ----
 include/configs/socfpga_vining_fpga.h    | 18 -------
 13 files changed, 7 insertions(+), 120 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/4 arm: socfpga: move vining_fpga to DM_I2C

All socfpga boards except for vining_fpga use DM_I2C. Enable DM_I2C for this board and set the EEPROM defines via Kconfig (enabling CONFIG_I2C_EEPROM from MISC).

---

Changes in v3: None
Changes in v2:
- added (this) patch to move socfpga_vining to DM_I2C

 configs/socfpga_vining_fpga_defconfig |  8 +++++++-
 include/configs/socfpga_common.h      | 26 --------------------------
 include/configs/socfpga_vining_fpga.h |  9 ---------
 3 files changed, 7 insertions(+), 36 deletions(-)
configs/socfpga_vining_fpga_defconfig +7 -1
index 7b47b111b7..4a7f775337 100644
@@ -16,8 +16,8 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_CMD_ASKENV=y
-CONFIG_CMD_GREPENV=y
 CONFIG_CMD_EEPROM=y
+CONFIG_CMD_GREPENV=y
 CONFIG_CMD_DFU=y
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_GPIO=y
@@ -44,6 +44,7 @@ CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
+CONFIG_DM_I2C=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y
 CONFIG_LED_STATUS0=y
@@ -55,6 +56,11 @@ CONFIG_LED_STATUS_BIT2=54
 CONFIG_LED_STATUS3=y
 CONFIG_LED_STATUS_BIT3=65
 CONFIG_LED_STATUS_CMD=y
+CONFIG_MISC=y
+CONFIG_I2C_EEPROM=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x50
+CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=3
+CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=70
 CONFIG_DM_MMC=y
 CONFIG_MMC_DW=y
 CONFIG_MTD_DEVICE=y
include/configs/socfpga_common.h +0 -26
index a501b5209f..a65fc804e3 100644
@@ -149,32 +149,6 @@
 #define CONFIG_SYS_NAND_DATA_BASE	SOCFPGA_NANDDATA_ADDRESS
 #endif
 
-/*
- * I2C support
- */
-#ifndef CONFIG_DM_I2C
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_BASE		SOCFPGA_I2C0_ADDRESS
-#define CONFIG_SYS_I2C_BASE1		SOCFPGA_I2C1_ADDRESS
-#define CONFIG_SYS_I2C_BASE2		SOCFPGA_I2C2_ADDRESS
-#define CONFIG_SYS_I2C_BASE3		SOCFPGA_I2C3_ADDRESS
-/* Using standard mode which the speed up to 100Kb/s */
-#define CONFIG_SYS_I2C_SPEED		100000
-#define CONFIG_SYS_I2C_SPEED1		100000
-#define CONFIG_SYS_I2C_SPEED2		100000
-#define CONFIG_SYS_I2C_SPEED3		100000
-/* Address of device when used as slave */
-#define CONFIG_SYS_I2C_SLAVE		0x02
-#define CONFIG_SYS_I2C_SLAVE1		0x02
-#define CONFIG_SYS_I2C_SLAVE2		0x02
-#define CONFIG_SYS_I2C_SLAVE3		0x02
-#ifndef __ASSEMBLY__
-/* Clock supplied to I2C controller in unit of MHz */
-unsigned int cm_get_l4_sp_clk_hz(void);
-#define IC_CLK				(cm_get_l4_sp_clk_hz() / 1000000)
-#endif
-#endif /* CONFIG_DM_I2C */
-
 /*
  * QSPI support
  */
include/configs/socfpga_vining_fpga.h +0 -9
index 5517ed722d..0e547a1295 100644
@@ -16,15 +16,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* I2C EEPROM */
-#ifdef CONFIG_CMD_EEPROM
-#define CONFIG_SYS_I2C_EEPROM_ADDR		0x50
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		1
-#define CONFIG_SYS_I2C_EEPROM_BUS		0
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
-#define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	70
-#endif
-
 /*
  * Status LEDs:
  *   0 ... Top Green
Signature · 1 line
2.17.1
#2 lore raw

PATCH v3 2/4 arm: socfpga: clean up socfpga_common.h

In reply to Simon Goldschmidt

Remove outdated macros and comments (not used any more, outdated due to DM conversion) from socfpga_common.h.

---

Changes in v3:
- changed commit message: s/defines/macros and comments/

Changes in v2:
- remove even more outdated things

 include/configs/socfpga_common.h | 40 --------------------------------
 1 file changed, 40 deletions(-)
include/configs/socfpga_common.h +0 -40
index a65fc804e3..5b5e5f5d43 100644
@@ -72,29 +72,12 @@
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 						/* Boot argument buffer size */
 
-#ifndef CONFIG_SYS_HOSTNAME
-#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
-#endif
-
 /*
  * Cache
  */
 #define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE		SOCFPGA_MPUL2_ADDRESS
 
-/*
- * EPCS/EPCQx1 Serial Flash Controller
- */
-#ifdef CONFIG_ALTERA_SPI
-/*
- * The base address is configurable in QSys, each board must specify the
- * base address based on it's particular FPGA configuration. Please note
- * that the address here is incremented by  0x400  from the Base address
- * selected in QSys, since the SPI registers are at offset +0x400.
- * #define CONFIG_SYS_SPI_BASE		0xff240400
- */
-#endif
-
 /*
  * Ethernet on SoC (EMAC)
  */
@@ -162,15 +145,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_CQSPI_REF_CLK		cm_get_qspi_controller_clk_hz()
 #endif
 
-/*
- * Designware SPI support
- */
-
-/*
- * Serial Driver
- */
-#define CONFIG_SYS_NS16550_SERIAL
-
 /*
  * USB
  */
@@ -206,20 +180,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_ENV_SECT_SIZE		(64 * 1024)
 #endif
 
-/*
- * mtd partitioning for serial NOR flash
- *
- * device nor0 <ff705000.spi.0>, # parts = 6
- * #: name                size            offset          mask_flags
- * 0: u-boot              0x00100000      0x00000000      0
- * 1: env1                0x00040000      0x00100000      0
- * 2: env2                0x00040000      0x00140000      0
- * 3: UBI                 0x03e80000      0x00180000      0
- * 4: boot                0x00e80000      0x00180000      0
- * 5: rootfs              0x01000000      0x01000000      0
- *
- */
-
 /*
  * SPL
  *
Signature · 1 line
2.17.1
#3 lore raw

PATCH v3 3/4 arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ

In reply to Simon Goldschmidt

socfpga_common.h defines CONFIG_SYS_BOOTMAPSZ to 64 MiB.

Since having this define overrides the 'bootm_size' env variable for the whole socfpga platform, let's remove this define from socfpga_common.h and instead rely on the 'bootm_size' env variable (which is initialized to 160 MiB in the same file's default env). This gives users the chance to override it in their own environment.

---

Changes in v3: None
Changes in v2: None

 include/configs/socfpga_common.h | 2 --
 1 file changed, 2 deletions(-)
include/configs/socfpga_common.h +0 -2
index 5b5e5f5d43..5eccb01d1d 100644
@@ -10,8 +10,6 @@
  */
 #define CONFIG_CLOCKS
 
-#define CONFIG_SYS_BOOTMAPSZ		(64 * 1024 * 1024)
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 /*
Signature · 1 line
2.17.1
#4 lore raw

PATCH v3 4/4 arm: socfpga: clean up board config files

In reply to Simon Goldschmidt

Remove outdated defines (not used any more, outdated due to DM conversion) from various socfpga files in include/config.

---

Changes in v3: None
Changes in v2:
- added (this) patch with further cleanups to the socfpga board config files

 include/configs/socfpga_arria10_socdk.h  |  6 ------
 include/configs/socfpga_arria5_socdk.h   |  2 --
 include/configs/socfpga_cyclone5_socdk.h |  2 --
 include/configs/socfpga_de0_nano_soc.h   |  2 --
 include/configs/socfpga_de10_nano.h      |  2 --
 include/configs/socfpga_de1_soc.h        |  2 --
 include/configs/socfpga_is1.h            |  2 --
 include/configs/socfpga_sockit.h         |  2 --
 include/configs/socfpga_socrates.h       |  2 --
 include/configs/socfpga_sr1500.h         | 11 -----------
 include/configs/socfpga_vining_fpga.h    |  9 ---------
 11 files changed, 42 deletions(-)
include/configs/socfpga_arria10_socdk.h +0 -6
index 0f116fbf2d..92630c5e6e 100644
@@ -19,12 +19,6 @@
 /* Memory configurations  */
 #define PHYS_SDRAM_1_SIZE		0x40000000
 
-/* Ethernet on SoC (EMAC) */
-
-/*
- * U-Boot environment configurations
- */
-
 /*
  * Serial / UART configurations
  */
include/configs/socfpga_arria5_socdk.h +0 -2
index 24fcdd8b5a..af6137aeb1 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_cyclone5_socdk.h +0 -2
index 18da8496ef..028db2a09e 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_de0_nano_soc.h +0 -2
index d3224d5bd3..21108e3447 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_de10_nano.h +0 -2
index 2fcabff8af..d85f98fbd4 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_de1_soc.h +0 -2
index f37099c58f..9919d292dc 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_is1.h +0 -2
index c233c208a5..c4da5947f3 100644
@@ -19,8 +19,6 @@
 /* Ethernet on SoC (EMAC) */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_ARP_TIMEOUT		500UL
-
-/* PHY */
 #endif
 
 /* The rest of the configuration is shared */
include/configs/socfpga_sockit.h +0 -2
index 3a7f354914..972999949a 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_socrates.h +0 -2
index f0d9347891..7faea150a9 100644
@@ -14,8 +14,6 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/* Ethernet on SoC (EMAC) */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_sr1500.h +0 -11
index b6a98611c0..3a8ccc3021 100644
@@ -19,8 +19,6 @@
 /* The PHY is autodetected, so no MII PHY address is needed here */
 #define PHY_ANEG_TIMEOUT	8000
 
-/* Environment */
-
 /* Enable SPI NOR flash reset, needed for SPI booting */
 #define CONFIG_SPI_N25Q256A_RESET
 
@@ -36,15 +34,6 @@
 #define CONFIG_ENV_OFFSET	0x000e0000
 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SECT_SIZE)
 
-/*
- * The QSPI NOR flash layout on SR1500:
- *
- * 0000.0000 - 0003.ffff: SPL (4 times)
- * 0004.0000 - 000d.ffff: U-Boot
- * 000e.0000 - 000e.ffff: env1
- * 000f.0000 - 000f.ffff: env2
- */
-
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>
 
include/configs/socfpga_vining_fpga.h +0 -9
index 0e547a1295..29a92b9146 100644
@@ -16,18 +16,9 @@
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
 
-/*
- * Status LEDs:
- *   0 ... Top Green
- *   1 ... Top Red
- *   2 ... Bottom Green
- *   3 ... Bottom Red
- */
-
 /* Ethernet on SoC (EMAC) */
 #if defined(CONFIG_CMD_NET)
 #define CONFIG_BOOTP_SEND_HOSTNAME
-/* PHY */
 #endif
 
 /* Extra Environment */
Signature · 1 line
2.17.1
#5 lore raw

v3 cover arm: socfpga: clean up socfpga_common.h

In reply to Simon Goldschmidt
Quoted 20 lines · Simon Goldschmidt

This series cleans up the include/configs/socfpga_common.h file a bit.

It removes some defines that are used nowhere and cleans up some leftovers after various subsystems have been converted to use DM.

Changes in v3:
- changed commit message of 2/4: s/defines/macros and comments/

Changes in v2:
- added (this) patch to move socfpga_vining to DM_I2C
- remove even more outdated things
- added (this) patch with further cleanups to the socfpga board config files

Simon Goldschmidt (4):
arm: socfpga: move vining_fpga to DM_I2C
arm: socfpga: clean up socfpga_common.h
arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ
arm: socfpga: clean up board config files

Quoted 14 lines
 configs/socfpga_vining_fpga_defconfig    |  8 ++-
 include/configs/socfpga_arria10_socdk.h  |  6 ---
 include/configs/socfpga_arria5_socdk.h   |  2 -
 include/configs/socfpga_common.h         | 68 ------------------------
 include/configs/socfpga_cyclone5_socdk.h |  2 -
 include/configs/socfpga_de0_nano_soc.h   |  2 -
 include/configs/socfpga_de10_nano.h      |  2 -
 include/configs/socfpga_de1_soc.h        |  2 -
 include/configs/socfpga_is1.h            |  2 -
 include/configs/socfpga_sockit.h         |  2 -
 include/configs/socfpga_socrates.h       |  2 -
 include/configs/socfpga_sr1500.h         | 11 ----
 include/configs/socfpga_vining_fpga.h    | 18 -------
 13 files changed, 7 insertions(+), 120 deletions(-)

I wanted to pick the whole thing, but it doesn't apply to u-boot-socfpga/master or u-boot/master . Can you please rebase it ? I pushed updated u-boot-socfpga/master , which matches u-boot/master .

Signature · 2 lines
Best regards,
Marek Vasut
#6 lore raw

v3 cover arm: socfpga: clean up socfpga_common.h

Am 22.04.2019 um 20:13 schrieb Marek Vasut:

Quoted 36 lines · Simon Goldschmidt
Quoted 20 lines

This series cleans up the include/configs/socfpga_common.h file a bit.

It removes some defines that are used nowhere and cleans up some leftovers after various subsystems have been converted to use DM.

Changes in v3:
- changed commit message of 2/4: s/defines/macros and comments/

Changes in v2:
- added (this) patch to move socfpga_vining to DM_I2C
- remove even more outdated things
- added (this) patch with further cleanups to the socfpga board config files

Simon Goldschmidt (4):
arm: socfpga: move vining_fpga to DM_I2C
arm: socfpga: clean up socfpga_common.h
arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ
arm: socfpga: clean up board config files

Quoted 14 lines
  configs/socfpga_vining_fpga_defconfig    |  8 ++-
  include/configs/socfpga_arria10_socdk.h  |  6 ---
  include/configs/socfpga_arria5_socdk.h   |  2 -
  include/configs/socfpga_common.h         | 68 ------------------------
  include/configs/socfpga_cyclone5_socdk.h |  2 -
  include/configs/socfpga_de0_nano_soc.h   |  2 -
  include/configs/socfpga_de10_nano.h      |  2 -
  include/configs/socfpga_de1_soc.h        |  2 -
  include/configs/socfpga_is1.h            |  2 -
  include/configs/socfpga_sockit.h         |  2 -
  include/configs/socfpga_socrates.h       |  2 -
  include/configs/socfpga_sr1500.h         | 11 ----
  include/configs/socfpga_vining_fpga.h    | 18 -------
  13 files changed, 7 insertions(+), 120 deletions(-)
Quoted 4 lines

I wanted to pick the whole thing, but it doesn't apply to u-boot-socfpga/master or u-boot/master . Can you please rebase it ? I pushed updated u-boot-socfpga/master , which matches u-boot/master .

I'm preparing a pull request. This was just for the patch being on the list. Sorry, I should have mentioned that.

The reason it doesn't apply is that it depens on other patches.

Regards,
Simon

#7 lore raw

v3 cover arm: socfpga: clean up socfpga_common.h

Quoted 42 lines · Simon Goldschmidt

Am 22.04.2019 um 20:13 schrieb Marek Vasut:

Quoted 36 lines · Simon Goldschmidt
Quoted 33 lines

This series cleans up the include/configs/socfpga_common.h file a bit.

It removes some defines that are used nowhere and cleans up some leftovers after various subsystems have been converted to use DM.

Changes in v3:
- changed commit message of 2/4: s/defines/macros and comments/

Changes in v2:
- added (this) patch to move socfpga_vining to DM_I2C
- remove even more outdated things
- added (this) patch with further cleanups to the socfpga board config files

Simon Goldschmidt (4):
   arm: socfpga: move vining_fpga to DM_I2C
   arm: socfpga: clean up socfpga_common.h
   arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ
   arm: socfpga: clean up board config files

  configs/socfpga_vining_fpga_defconfig    |  8 ++- include/configs/socfpga_arria10_socdk.h  |  6 --- include/configs/socfpga_arria5_socdk.h   |  2 - include/configs/socfpga_common.h         | 68 ------------------------ include/configs/socfpga_cyclone5_socdk.h |  2 - include/configs/socfpga_de0_nano_soc.h   |  2 - include/configs/socfpga_de10_nano.h      |  2 - include/configs/socfpga_de1_soc.h        |  2 - include/configs/socfpga_is1.h            |  2 - include/configs/socfpga_sockit.h         |  2 - include/configs/socfpga_socrates.h       |  2 - include/configs/socfpga_sr1500.h         | 11 ---- include/configs/socfpga_vining_fpga.h    | 18 -------

Quoted 1 line
  13 files changed, 7 insertions(+), 120 deletions(-)
Quoted 4 lines

I wanted to pick the whole thing, but it doesn't apply to u-boot-socfpga/master or u-boot/master . Can you please rebase it ? I pushed updated u-boot-socfpga/master , which matches u-boot/master .

Quoted 4 lines

I'm preparing a pull request. This was just for the patch being on the list. Sorry, I should have mentioned that.

The reason it doesn't apply is that it depens on other patches.

Fine, thanks.

Signature · 2 lines
Best regards,
Marek Vasut