All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
@ 2019-04-23 19:36 Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 1/4] arm: socfpga: move vining_fpga to DM_I2C Simon Goldschmidt
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 19:36 UTC (permalink / raw)
  To: u-boot

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 v4:
- fix DM_I2C case: don't call i2c_set_bus_num() since this is
  done in cmd/eeprom already

Changes in v3:
- changed commit message: 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

 board/samtec/vining_fpga/socfpga.c       |  9 +---
 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 -------
 14 files changed, 8 insertions(+), 128 deletions(-)

-- 
2.17.1

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 1/4] arm: socfpga: move vining_fpga to DM_I2C
  2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
@ 2019-04-23 19:36 ` Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 2/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 19:36 UTC (permalink / raw)
  To: u-boot

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).

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---

Changes in v4:
- fix DM_I2C case: don't call i2c_set_bus_num() since this is
  done in cmd/eeprom already

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

 board/samtec/vining_fpga/socfpga.c    |  9 +--------
 configs/socfpga_vining_fpga_defconfig |  8 +++++++-
 include/configs/socfpga_common.h      | 26 --------------------------
 include/configs/socfpga_vining_fpga.h |  9 ---------
 4 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/board/samtec/vining_fpga/socfpga.c b/board/samtec/vining_fpga/socfpga.c
index d99aac6828..efc8ddf162 100644
--- a/board/samtec/vining_fpga/socfpga.c
+++ b/board/samtec/vining_fpga/socfpga.c
@@ -52,14 +52,7 @@ int misc_init_r(void)
 	u32 serial;
 	int ret;
 
-	/* EEPROM is at bus 0. */
-	ret = i2c_set_bus_num(0);
-	if (ret) {
-		puts("Cannot select EEPROM I2C bus.\n");
-		return 0;
-	}
-
-	/* EEPROM is at address 0x50. */
+	/* EEPROM is at address 0x50 (at bus CONFIG_SYS_EEPROM_BUS_NUM). */
 	ret = eeprom_read(0x50, 0, data, sizeof(data));
 	if (ret) {
 		puts("Cannot read I2C EEPROM.\n");
diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
index 7b47b111b7..4a7f775337 100644
--- a/configs/socfpga_vining_fpga_defconfig
+++ b/configs/socfpga_vining_fpga_defconfig
@@ -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
diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index a501b5209f..a65fc804e3 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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
  */
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 5517ed722d..0e547a1295 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -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
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 2/4] arm: socfpga: clean up socfpga_common.h
  2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 1/4] arm: socfpga: move vining_fpga to DM_I2C Simon Goldschmidt
@ 2019-04-23 19:36 ` Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 3/4] arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ Simon Goldschmidt
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 19:36 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---

Changes in v4: None
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(-)

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index a65fc804e3..5b5e5f5d43 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -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
  *
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 3/4] arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ
  2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 1/4] arm: socfpga: move vining_fpga to DM_I2C Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 2/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
@ 2019-04-23 19:36 ` Simon Goldschmidt
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 4/4] arm: socfpga: clean up board config files Simon Goldschmidt
  2019-04-23 20:43 ` [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Marek Vasut
  4 siblings, 0 replies; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 19:36 UTC (permalink / raw)
  To: u-boot

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.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 include/configs/socfpga_common.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 5b5e5f5d43..5eccb01d1d 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -10,8 +10,6 @@
  */
 #define CONFIG_CLOCKS
 
-#define CONFIG_SYS_BOOTMAPSZ		(64 * 1024 * 1024)
-
 #define CONFIG_TIMESTAMP		/* Print image info with timestamp */
 
 /*
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 4/4] arm: socfpga: clean up board config files
  2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
                   ` (2 preceding siblings ...)
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 3/4] arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ Simon Goldschmidt
@ 2019-04-23 19:36 ` Simon Goldschmidt
  2019-04-23 20:43 ` [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Marek Vasut
  4 siblings, 0 replies; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 19:36 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>
---

Changes in v4: None
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(-)

diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h
index 0f116fbf2d..92630c5e6e 100644
--- a/include/configs/socfpga_arria10_socdk.h
+++ b/include/configs/socfpga_arria10_socdk.h
@@ -19,12 +19,6 @@
 /* Memory configurations  */
 #define PHYS_SDRAM_1_SIZE		0x40000000
 
-/* Ethernet on SoC (EMAC) */
-
-/*
- * U-Boot environment configurations
- */
-
 /*
  * Serial / UART configurations
  */
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 24fcdd8b5a..af6137aeb1 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -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>
 
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 18da8496ef..028db2a09e 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -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>
 
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index d3224d5bd3..21108e3447 100644
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -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>
 
diff --git a/include/configs/socfpga_de10_nano.h b/include/configs/socfpga_de10_nano.h
index 2fcabff8af..d85f98fbd4 100644
--- a/include/configs/socfpga_de10_nano.h
+++ b/include/configs/socfpga_de10_nano.h
@@ -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>
 
diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h
index f37099c58f..9919d292dc 100644
--- a/include/configs/socfpga_de1_soc.h
+++ b/include/configs/socfpga_de1_soc.h
@@ -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>
 
diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h
index c233c208a5..c4da5947f3 100644
--- a/include/configs/socfpga_is1.h
+++ b/include/configs/socfpga_is1.h
@@ -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 */
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 3a7f354914..972999949a 100644
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -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>
 
diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
index f0d9347891..7faea150a9 100644
--- a/include/configs/socfpga_socrates.h
+++ b/include/configs/socfpga_socrates.h
@@ -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>
 
diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
index b6a98611c0..3a8ccc3021 100644
--- a/include/configs/socfpga_sr1500.h
+++ b/include/configs/socfpga_sr1500.h
@@ -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>
 
diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h
index 0e547a1295..29a92b9146 100644
--- a/include/configs/socfpga_vining_fpga.h
+++ b/include/configs/socfpga_vining_fpga.h
@@ -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 */
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
  2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
                   ` (3 preceding siblings ...)
  2019-04-23 19:36 ` [U-Boot] [PATCH v4 4/4] arm: socfpga: clean up board config files Simon Goldschmidt
@ 2019-04-23 20:43 ` Marek Vasut
  2019-04-23 20:51   ` Simon Goldschmidt
  4 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2019-04-23 20:43 UTC (permalink / raw)
  To: u-boot

On 4/23/19 9:36 PM, Simon Goldschmidt wrote:
> 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 v4:
> - fix DM_I2C case: don't call i2c_set_bus_num() since this is
>   done in cmd/eeprom already
> 
> Changes in v3:
> - changed commit message: 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
> 
>  board/samtec/vining_fpga/socfpga.c       |  9 +---
>  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 -------
>  14 files changed, 8 insertions(+), 128 deletions(-)

Neither of these apply to u-boot-socfpga/master :-(

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
  2019-04-23 20:43 ` [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Marek Vasut
@ 2019-04-23 20:51   ` Simon Goldschmidt
  2019-04-23 21:24     ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-23 20:51 UTC (permalink / raw)
  To: u-boot

Marek Vasut <marex@denx.de> schrieb am Di., 23. Apr. 2019, 22:43:

> On 4/23/19 9:36 PM, Simon Goldschmidt wrote:
> > 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 v4:
> > - fix DM_I2C case: don't call i2c_set_bus_num() since this is
> >   done in cmd/eeprom already
> >
> > Changes in v3:
> > - changed commit message: 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
> >
> >  board/samtec/vining_fpga/socfpga.c       |  9 +---
> >  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 -------
> >  14 files changed, 8 insertions(+), 128 deletions(-)
>
> Neither of these apply to u-boot-socfpga/master :-(
>

Sorry for the confusion, these are again meant to apply on top of other
patches in a PR. Sent to the ML for reference, mainly, as the diffs are
tiny.

How should I mark such patches to prevent such misunderstandings in the
future?

Regards,
Simon

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
  2019-04-23 20:51   ` Simon Goldschmidt
@ 2019-04-23 21:24     ` Marek Vasut
  2019-04-24 17:36       ` Simon Goldschmidt
  0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2019-04-23 21:24 UTC (permalink / raw)
  To: u-boot

On 4/23/19 10:51 PM, Simon Goldschmidt wrote:
> 
> 
> Marek Vasut <marex at denx.de <mailto:marex@denx.de>> schrieb am Di., 23.
> Apr. 2019, 22:43:
> 
>     On 4/23/19 9:36 PM, Simon Goldschmidt wrote:
>     > 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 v4:
>     > - fix DM_I2C case: don't call i2c_set_bus_num() since this is
>     >   done in cmd/eeprom already
>     >
>     > Changes in v3:
>     > - changed commit message: 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
>     >
>     >  board/samtec/vining_fpga/socfpga.c       |  9 +---
>     >  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 -------
>     >  14 files changed, 8 insertions(+), 128 deletions(-)
> 
>     Neither of these apply to u-boot-socfpga/master :-(
> 
> 
> Sorry for the confusion, these are again meant to apply on top of other
> patches in a PR. Sent to the ML for reference, mainly, as the diffs are
> tiny.
> 
> How should I mark such patches to prevent such misunderstandings in the
> future?

Just send an incremental patch on top of u-boot-socfpga/master please .
If you want me to squash it into another patch, note it somewhere around
the diffstat.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
  2019-04-23 21:24     ` Marek Vasut
@ 2019-04-24 17:36       ` Simon Goldschmidt
  2019-04-24 17:42         ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Simon Goldschmidt @ 2019-04-24 17:36 UTC (permalink / raw)
  To: u-boot

Am 23.04.2019 um 23:24 schrieb Marek Vasut:
> On 4/23/19 10:51 PM, Simon Goldschmidt wrote:
>>
>>
>> Marek Vasut <marex at denx.de <mailto:marex@denx.de>> schrieb am Di., 23.
>> Apr. 2019, 22:43:
>>
>>      On 4/23/19 9:36 PM, Simon Goldschmidt wrote:
>>      > 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 v4:
>>      > - fix DM_I2C case: don't call i2c_set_bus_num() since this is
>>      >   done in cmd/eeprom already
>>      >
>>      > Changes in v3:
>>      > - changed commit message: 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
>>      >
>>      >  board/samtec/vining_fpga/socfpga.c       |  9 +---
>>      >  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 -------
>>      >  14 files changed, 8 insertions(+), 128 deletions(-)
>>
>>      Neither of these apply to u-boot-socfpga/master :-(
>>
>>
>> Sorry for the confusion, these are again meant to apply on top of other
>> patches in a PR. Sent to the ML for reference, mainly, as the diffs are
>> tiny.
>>
>> How should I mark such patches to prevent such misunderstandings in the
>> future?
> 
> Just send an incremental patch on top of u-boot-socfpga/master please .
> If you want me to squash it into another patch, note it somewhere around
> the diffstat.
> 

OK, in this case, drop this v4.

Regards,
Simon

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h
  2019-04-24 17:36       ` Simon Goldschmidt
@ 2019-04-24 17:42         ` Marek Vasut
  0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2019-04-24 17:42 UTC (permalink / raw)
  To: u-boot

On 4/24/19 7:36 PM, Simon Goldschmidt wrote:
> Am 23.04.2019 um 23:24 schrieb Marek Vasut:
>> On 4/23/19 10:51 PM, Simon Goldschmidt wrote:
>>>
>>>
>>> Marek Vasut <marex at denx.de <mailto:marex@denx.de>> schrieb am Di., 23.
>>> Apr. 2019, 22:43:
>>>
>>>      On 4/23/19 9:36 PM, Simon Goldschmidt wrote:
>>>      > 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 v4:
>>>      > - fix DM_I2C case: don't call i2c_set_bus_num() since this is
>>>      >   done in cmd/eeprom already
>>>      >
>>>      > Changes in v3:
>>>      > - changed commit message: 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
>>>      >
>>>      >  board/samtec/vining_fpga/socfpga.c       |  9 +---
>>>      >  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 -------
>>>      >  14 files changed, 8 insertions(+), 128 deletions(-)
>>>
>>>      Neither of these apply to u-boot-socfpga/master :-(
>>>
>>>
>>> Sorry for the confusion, these are again meant to apply on top of other
>>> patches in a PR. Sent to the ML for reference, mainly, as the diffs are
>>> tiny.
>>>
>>> How should I mark such patches to prevent such misunderstandings in the
>>> future?
>>
>> Just send an incremental patch on top of u-boot-socfpga/master please .
>> If you want me to squash it into another patch, note it somewhere around
>> the diffstat.
>>
> 
> OK, in this case, drop this v4.

Cool, thanks.

-- 
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2019-04-24 17:42 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-23 19:36 [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
2019-04-23 19:36 ` [U-Boot] [PATCH v4 1/4] arm: socfpga: move vining_fpga to DM_I2C Simon Goldschmidt
2019-04-23 19:36 ` [U-Boot] [PATCH v4 2/4] arm: socfpga: clean up socfpga_common.h Simon Goldschmidt
2019-04-23 19:36 ` [U-Boot] [PATCH v4 3/4] arm: socfpga: remove CONFIG_SYS_BOOTMAPSZ Simon Goldschmidt
2019-04-23 19:36 ` [U-Boot] [PATCH v4 4/4] arm: socfpga: clean up board config files Simon Goldschmidt
2019-04-23 20:43 ` [U-Boot] [PATCH v4 0/4] arm: socfpga: clean up socfpga_common.h Marek Vasut
2019-04-23 20:51   ` Simon Goldschmidt
2019-04-23 21:24     ` Marek Vasut
2019-04-24 17:36       ` Simon Goldschmidt
2019-04-24 17:42         ` Marek Vasut

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.