arm: socfpga: de0_nano: Zap VIRTUAL_TARGET

PATCH New Marek Vasut 2 participants 28 messages Dec 5, 2015 – Dec 9, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/socfpga architecture

lore

Share & tools

lore

Marek Vasut

author

2015-12-05 20:44 UTC #0 lore raw

PATCH 1/6 arm: socfpga: de0_nano: Zap VIRTUAL_TARGET

There is no VT for this board, so remove this incorrect macro.

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 include/configs/socfpga_de0_nano_soc.h | 4 ----
 1 file changed, 4 deletions(-)

include/configs/socfpga_de0_nano_soc.h +0 -4

index d27aa9b..6007895 100644
@@ -37,11 +37,7 @@
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTFILE		"fitImage"
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
-#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
-#define CONFIG_BOOTCOMMAND	"run ramboot"
-#else
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
-#endif
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR

Signature · 1 line

2.1.4

Marek Vasut

author

2015-12-05 20:44 UTC #1 lore raw

PATCH 2/6 arm: socfpga: sockit: Zap VIRTUAL_TARGET

There is no VT for this board, so remove this incorrect macro.

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 include/configs/socfpga_sockit.h | 4 ----
 1 file changed, 4 deletions(-)

include/configs/socfpga_sockit.h +0 -4

index eefe01c..924de3f 100644
@@ -37,11 +37,7 @@
 #define CONFIG_BOOTDELAY	3
 #define CONFIG_BOOTFILE		"fitImage"
 #define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
-#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
-#define CONFIG_BOOTCOMMAND	"run ramboot"
-#else
 #define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
-#endif
 #define CONFIG_LOADADDR		0x01000000
 #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR

Signature · 1 line

2.1.4

Chin Liang See

2015-12-07 06:14 UTC #2 lore raw

PATCH 2/6 arm: socfpga: sockit: Zap VIRTUAL_TARGET

Quoted 9 lines · Marek Vasut

There is no VT for this board, so remove this incorrect macro.
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_sockit.h | 4 ----
 1 file changed, 4 deletions(-)

Reviewed-by Chin Liang See <[email protected]>

Thanks
Chin Liang

Marek Vasut

author

2015-12-05 20:44 UTC #3 lore raw

PATCH 3/6 arm: socfpga: Switch CONFIG_G_DNL_MANUFACTURER to CONFIG_SYS_VENDOR

In reply to Marek Vasut

We already have the CONFIG_SYS_VENDOR variable, which defines the manufacturer of the board. The value in CONFIG_G_DNL_MANUFACTURER is just a duplicity, so switch it to reuse CONFIG_SYS_VENDOR .

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 include/configs/socfpga_arria5_socdk.h   | 3 ---
 include/configs/socfpga_common.h         | 2 +-
 include/configs/socfpga_cyclone5_socdk.h | 3 ---
 include/configs/socfpga_de0_nano_soc.h   | 3 ---
 include/configs/socfpga_mcvevk.h         | 3 ---
 include/configs/socfpga_sockit.h         | 3 ---
 include/configs/socfpga_socrates.h       | 3 ---
 7 files changed, 1 insertion(+), 19 deletions(-)

include/configs/socfpga_arria5_socdk.h +0 -3

index d2411e6..a036856 100644
@@ -55,9 +55,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Altera"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME		socfpga_arria5

include/configs/socfpga_common.h +1 -1

index b0bc689..4b2d246 100644
@@ -262,7 +262,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_G_DNL_UMS_VENDOR_NUM	CONFIG_G_DNL_VENDOR_NUM
 #define CONFIG_G_DNL_UMS_PRODUCT_NUM	CONFIG_G_DNL_PRODUCT_NUM
 #ifndef CONFIG_G_DNL_MANUFACTURER
-#define CONFIG_G_DNL_MANUFACTURER	"Altera"
+#define CONFIG_G_DNL_MANUFACTURER	CONFIG_SYS_VENDOR
 #endif
 #endif

include/configs/socfpga_cyclone5_socdk.h +0 -3

index 76d29a3..4e38d5e 100644
@@ -55,9 +55,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Altera"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME		socfpga_cyclone5

include/configs/socfpga_de0_nano_soc.h +0 -3

index 6007895..e06ca7b 100644
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Terasic"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME		socfpga_de0_nano_soc

include/configs/socfpga_mcvevk.h +0 -3

index b2c1f75..5fc4edb 100644
@@ -48,9 +48,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER	"DENX"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME			mcvevk

include/configs/socfpga_sockit.h +0 -3

index 924de3f..d5e69fd 100644
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "Terasic"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME		socfpga_sockit

include/configs/socfpga_socrates.h +0 -3

index 1b0888f..f11c89c 100644
@@ -51,9 +51,6 @@
 #define CONFIG_SYS_MMC_ENV_DEV		0	/* device 0 */
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
-/* USB */
-#define CONFIG_G_DNL_MANUFACTURER      "EBV"
-
 /* Extra Environment */
 #define CONFIG_HOSTNAME		socfpga_socrates

Signature · 1 line

2.1.4

Chin Liang See

2015-12-07 06:18 UTC #4 lore raw

PATCH 3/6 arm: socfpga: Switch CONFIG_G_DNL_MANUFACTURER to CONFIG_SYS_VENDOR

Quoted 7 lines · Marek Vasut

We already have the CONFIG_SYS_VENDOR variable, which defines the manufacturer of the board. The value in CONFIG_G_DNL_MANUFACTURER is just a duplicity, so switch it to reuse CONFIG_SYS_VENDOR .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>

Quoted 10 lines

---
 include/configs/socfpga_arria5_socdk.h   | 3 ---
 include/configs/socfpga_common.h         | 2 +-
 include/configs/socfpga_cyclone5_socdk.h | 3 ---
 include/configs/socfpga_de0_nano_soc.h   | 3 ---
 include/configs/socfpga_mcvevk.h         | 3 ---
 include/configs/socfpga_sockit.h         | 3 ---
 include/configs/socfpga_socrates.h       | 3 ---
 7 files changed, 1 insertion(+), 19 deletions(-)

Acked-by Chin Liang See <[email protected]>

Thanks
Chin Liang

Marek Vasut

author

2015-12-05 20:44 UTC #5 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

In reply to Marek Vasut

We already have the CONFIG_SYS_BOARD variable, which defines the name of the board. The value in CONFIG_HOSTNAME is exactly the same and is thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)

include/configs/socfpga_arria5_socdk.h +0 -2

index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

include/configs/socfpga_common.h +4 -0

index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 #define CONFIG_CMDLINE_EDITING			/* Command history etc */
 #define CONFIG_SYS_HUSH_PARSER
 
+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+
 /*
  * Cache
  */

include/configs/socfpga_cyclone5_socdk.h +0 -2

index 4e38d5e..d2efdda 100644
@@ -56,8 +56,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		socfpga_cyclone5
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

include/configs/socfpga_de0_nano_soc.h +0 -2

index e06ca7b..959e3af 100644
@@ -52,8 +52,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		socfpga_de0_nano_soc
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \

include/configs/socfpga_mcvevk.h +0 -2

index 5fc4edb..cd63faf 100644
@@ -49,8 +49,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME			mcvevk
-
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	"consdev=ttyS0\0"						\
 	"baudrate=115200\0"						\

include/configs/socfpga_sockit.h +0 -2

index d5e69fd..6cbe367 100644
@@ -52,8 +52,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		socfpga_sockit
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

include/configs/socfpga_socrates.h +0 -2

index f11c89c..1d88f4f 100644
@@ -52,8 +52,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after the MBR */
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME		socfpga_socrates
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

include/configs/socfpga_sr1500.h +0 -3

index bccb235..5bd2956 100644
@@ -53,9 +53,6 @@
 #define CONFIG_PHY_MARVELL
 #define PHY_ANEG_TIMEOUT	8000
 
-/* Extra Environment */
-#define CONFIG_HOSTNAME		sr1500
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \

Signature · 1 line

2.1.4

Chin Liang See

2015-12-07 06:25 UTC #6 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

Quoted 44 lines · Marek Vasut

We already have the CONFIG_SYS_BOARD variable, which defines the name of the board. The value in CONFIG_HOSTNAME is exactly the same and is thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)
include/configs/socfpga_arria5_socdk.h +0 -0
index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 #define CONFIG_ENV_OFFSET		512	/* just after
the MBR */
/* Extra Environment */
include/configs/socfpga_arria5_socdk.h +0 -2
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_common.h +0 -0
index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 #define CONFIG_CMDLINE_EDITING			/* Command
history etc */
#define CONFIG_SYS_HUSH_PARSER

include/configs/socfpga_common.h line 75

Quoted 4 lines

include/configs/socfpga_common.h +4 -0

+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+

I saw the change of hostname for socdk would be "socfpga_cyclone5" to "cyclone5-socdk" and same for other board. Wonder any impact on this change?

Thanks
Chin Liang

Marek Vasut

author

2015-12-07 08:36 UTC #7 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

Quoted 54 lines · Chin Liang See

Quoted 53 lines · Marek Vasut
We already have the CONFIG_SYS_BOARD variable, which defines the name of the board. The value in CONFIG_HOSTNAME is exactly the same and is thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)
include/configs/socfpga_arria5_socdk.h +0 -0
index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 
 #define CONFIG_ENV_OFFSET		512	/* just after
 
the MBR */
/* Extra Environment */
include/configs/socfpga_arria5_socdk.h +0 -2
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_common.h +0 -0
index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 
 #define CONFIG_CMDLINE_EDITING			/* Command
 
history etc */
#define CONFIG_SYS_HUSH_PARSER

Quoted 8 lines

include/configs/socfpga_common.h line 75
Quoted 4 lines
include/configs/socfpga_common.h +4 -0
+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+
I saw the change of hostname for socdk would be "socfpga_cyclone5" to "cyclone5-socdk" and same for other board. Wonder any impact on this change?

It should have no impact, unless you're using the hostname in your scripts for something. You would have no way to tell apart the cyclone5 boards with the old hostname though, since socfpga_cyclone5 is too generic. In case this breaks some script of yours, setenv hostname socfpga_cyclone5 would fix it.

Best regards,
Marek Vasut

Chin Liang See

2015-12-07 10:01 UTC #8 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

Quoted 69 lines · Marek Vasut

Quoted 57 lines · Chin Liang See
Quoted 56 lines · Marek Vasut
We already have the CONFIG_SYS_BOARD variable, which defines the name
of the board. The value in CONFIG_HOSTNAME is exactly the same and is
thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)
include/configs/socfpga_arria5_socdk.h +0 -0
index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 
 #define CONFIG_ENV_OFFSET		512	/* just
after
the MBR */
/* Extra Environment */
include/configs/socfpga_arria5_socdk.h +0 -2
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_common.h +0 -0
index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 
 #define CONFIG_CMDLINE_EDITING			/* Command
 
history etc */
#define CONFIG_SYS_HUSH_PARSER
Quoted 10 lines
include/configs/socfpga_common.h line 75
Quoted 4 lines
include/configs/socfpga_common.h +4 -0
+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+
I saw the change of hostname for socdk would be "socfpga_cyclone5" to
"cyclone5-socdk" and same for other board. Wonder any impact on this
change?

Quoted 8 lines

It should have no impact, unless you're using the hostname in your scripts
for something. You would have no way to tell apart the cyclone5 boards with
the old hostname though, since socfpga_cyclone5 is too generic. In case this
breaks some script of yours, setenv hostname socfpga_cyclone5 would fix it.

I grep previously and its not used. But will take note if any side effect noticed.

Thanks
Chin Liang

Quoted 3 lines

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-07 12:01 UTC #9 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

Quoted 80 lines · Chin Liang See

Quoted 70 lines · Marek Vasut
Quoted 58 lines · Chin Liang See
Quoted 57 lines · Marek Vasut
We already have the CONFIG_SYS_BOARD variable, which defines the name
of the board. The value in CONFIG_HOSTNAME is exactly the same and is
thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)
include/configs/socfpga_arria5_socdk.h +0 -0
index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 
 #define CONFIG_ENV_OFFSET		512	/* just
 
after
the MBR */
/* Extra Environment */
include/configs/socfpga_arria5_socdk.h +0 -2
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
include/configs/socfpga_common.h +0 -0
index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 
 #define CONFIG_CMDLINE_EDITING			/* Command
 
history etc */
#define CONFIG_SYS_HUSH_PARSER
Quoted 10 lines
include/configs/socfpga_common.h line 75
Quoted 4 lines
include/configs/socfpga_common.h +4 -0
+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+
I saw the change of hostname for socdk would be "socfpga_cyclone5" to
"cyclone5-socdk" and same for other board. Wonder any impact on this
change?
Quoted 8 lines
It should have no impact, unless you're using the hostname in your scripts
for something. You would have no way to tell apart the cyclone5 boards with
the old hostname though, since socfpga_cyclone5 is too generic. In case this
breaks some script of yours, setenv hostname socfpga_cyclone5 would fix it.

Quoted 2 lines

I grep previously and its not used. But will take note if any side effect noticed.

OK, thanks

Chin Liang See

2015-12-07 12:08 UTC #10 lore raw

PATCH 4/6 arm: socfpga: Switch CONFIG_HOSTNAME to CONFIG_SYS_BOARD

Quoted 91 lines · Marek Vasut

Quoted 90 lines · Chin Liang See
Quoted 88 lines · Marek Vasut
Quoted 63 lines · Chin Liang See
Quoted 62 lines · Marek Vasut
We already have the CONFIG_SYS_BOARD variable, which defines the
name
of the board. The value in CONFIG_HOSTNAME is exactly the same
and is
thus just a duplicity, so switch it to reuse CONFIG_SYS_BOARD .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_arria5_socdk.h   | 2 --
 include/configs/socfpga_common.h         | 4 ++++
 include/configs/socfpga_cyclone5_socdk.h | 2 --
 include/configs/socfpga_de0_nano_soc.h   | 2 --
 include/configs/socfpga_mcvevk.h         | 2 --
 include/configs/socfpga_sockit.h         | 2 --
 include/configs/socfpga_socrates.h       | 2 --
 include/configs/socfpga_sr1500.h         | 3 ---
 8 files changed, 4 insertions(+), 15 deletions(-)
include/configs/socfpga_arria5_socdk.h +0 -0
index a036856..3d5665d 100644
@@ -56,8 +56,6 @@
 
 #define CONFIG_ENV_OFFSET		512	/* just
 
after
the MBR */
/* Extra Environment */
include/configs/socfpga_arria5_socdk.h +0 -2
-#define CONFIG_HOSTNAME		socfpga_arria5
-
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 
 	"verify=n\0" \
 	"loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0"
\
include/configs/socfpga_common.h +0 -0
index 4b2d246..f74c758 100644
@@ -69,6 +69,10 @@
 
 #define CONFIG_CMDLINE_EDITING			/*
Command
history etc */
#define CONFIG_SYS_HUSH_PARSER
Quoted 11 lines
include/configs/socfpga_common.h line 75
Quoted 4 lines
include/configs/socfpga_common.h +4 -0
+#ifndef CONFIG_SYS_HOSTNAME
+#define CONFIG_SYS_HOSTNAME	CONFIG_SYS_BOARD
+#endif
+
I saw the change of hostname for socdk would be "socfpga_cyclone5"
to
"cyclone5-socdk" and same for other board. Wonder any impact on this
change?
It should have no impact, unless you're using the hostname in your
scripts
for something. You would have no way to tell apart the cyclone5 boards with
the old hostname though, since socfpga_cyclone5 is too generic. In
case this
breaks some script of yours, setenv hostname socfpga_cyclone5 would
fix it.

Quoted 4 lines

Quoted 2 lines
I grep previously and its not used. But will take note if any side effect noticed.
OK, thanks

Acked-by Chin Liang See <[email protected]>

Thanks
Chin Liang

Marek Vasut

author

2015-12-05 20:44 UTC #11 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

In reply to Marek Vasut

The SoCFPGA has reached a point where every single board code become the same, since each and every single board is probed equally from OF. Move the common board code into arch/arm/mach-socfpga/ .

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 arch/arm/mach-socfpga/Makefile |  2 +-
 arch/arm/mach-socfpga/board.c  | 64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-socfpga/board.c

arch/arm/mach-socfpga/Makefile +1 -1

index 316b326..5cf9e23 100644
@@ -8,7 +8,7 @@
 #
 
 obj-y	+= misc.o timer.o reset_manager.o system_manager.o clock_manager.o \
-	   fpga_manager.o scan_manager.o
+	   fpga_manager.o scan_manager.o board.o
 obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
 
 # QTS-generated config file wrappers

arch/arm/mach-socfpga/board.c new file +64 -0

64 lines not on this page · raw message

Signature · 1 line

2.1.4

Chin Liang See

2015-12-07 12:53 UTC #12 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

arch/arm/mach-socfpga/board.c

Quoted 36 lines · Marek Vasut

The SoCFPGA has reached a point where every single board code become the same, since each and every single board is probed equally from OF.
Move the common board code into arch/arm/mach-socfpga/ .
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 arch/arm/mach-socfpga/Makefile |  2 +-
 arch/arm/mach-socfpga/board.c  | 64
++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-socfpga/board.c
arch/arm/mach renamed from arch/arm/mach-socfpga/Makefile +0 -1
-socfpga/Makefile
index 316b326..5cf9e23 100644
arch/arm/mach-socfpga/Makefile +1 -1
@@ -8,7 +8,7 @@
 #
 
 obj-y	+= misc.o timer.o reset_manager.o system_manager.o
 clock_manager.o \
-	   fpga_manager.o scan_manager.o
+	   fpga_manager.o scan_manager.o board.o
 obj-$(CONFIG_SPL_BUILD) += spl.o freeze_controller.o
 
# QTS-generated config file wrappers
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0

I am thinking this can go into misc.c instead new file.

Quoted 15 lines

arch/arm/mach-socfpga/board.c new file +14 -0

@@ -0,0 +1,64 @@
+/*
+ * Altera SoCFPGA common board code
+ *
+ * Copyright (C) 2015 Marek Vasut <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/reset_manager.h>
+#include <asm/io.h>
+
+#include <usb.h>

arch/arm/mach-socfpga/board.c line 24

Quoted 10 lines

arch/arm/mach-socfpga/board.c new file +10 -0

+#include <usb/dwc2_udc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void s_init(void) {}
+
+/*
+ * Miscellaneous platform dependent initialisations
+ */
+int board_init(void)

I am thinking we can skip the board_init where it located at original board folder. If user has unique board specific initialization, they can still do it there.

Thanks
Chin Liang

Marek Vasut

author

2015-12-07 13:23 UTC #13 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:

[...]

Quoted 8 lines

arch/arm/mach-socfpga/board.c
Quoted 6 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.

misc.c is bloated with random crap already, I would like to keep things orderly a little. Let's keep the board code and platform code separated.

Quoted 21 lines

arch/arm/mach-socfpga/board.c new file +20 -0

@@ -0,0 +1,64 @@
+/*
+ * Altera SoCFPGA common board code
+ *
+ * Copyright (C) 2015 Marek Vasut <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/reset_manager.h>
+#include <asm/io.h>
+
+#include <usb.h>
+#include <usb/dwc2_udc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void s_init(void) {}
+

Quoted 8 lines

arch/arm/mach-socfpga/board.c line 24
Quoted 4 lines
arch/arm/mach-socfpga/board.c new file +4 -0
+/*
+ * Miscellaneous platform dependent initialisations
+ */
+int board_init(void)
I am thinking we can skip the board_init where it located at original board folder. If user has unique board specific initialization, they can still do it there.

See my reply to 6/6 .

Best regards,
Marek Vasut

Chin Liang See

2015-12-07 13:32 UTC #14 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 13 lines · Marek Vasut

On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:
[...]
Quoted 8 lines
arch/arm/mach-socfpga/board.c
Quoted 6 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.

Quoted 4 lines

misc.c is bloated with random crap already, I would like to keep things
orderly a little. Let's keep the board code and platform code separated.

Initial thinking misc.c should be as lean as possible but that seems not today. Can consider split them out per features such as usb.c ethernet.c.

Thanks
Chin Liang

Quoted 37 lines

Quoted 24 lines
Quoted 24 lines
arch/arm/mach-socfpga/board.c new file +22 -0
@@ -0,0 +1,64 @@
+/*
+ * Altera SoCFPGA common board code
+ *
+ * Copyright (C) 2015 Marek Vasut <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <asm/arch/reset_manager.h>
+#include <asm/io.h>
+
+#include <usb.h>
+#include <usb/dwc2_udc.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void s_init(void) {}
+
+/*
+ * Miscellaneous platform dependent initialisations
Quoted 8 lines
arch/arm/mach-socfpga/board.c line 24
Quoted 2 lines
arch/arm/mach-socfpga/board.c new file +2 -0
+ */
+int board_init(void)
I am thinking we can skip the board_init where it located at original
board folder. If user has unique board specific initialization, they
can still do it there.
See my reply to 6/6 .
Best regards,
Marek Vasut

Marek Vasut

author

2015-12-07 14:23 UTC #15 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 14 lines · Chin Liang See

Quoted 13 lines · Marek Vasut
On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:
[...]
Quoted 8 lines
arch/arm/mach-socfpga/board.c
Quoted 6 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.

Quoted 8 lines

Quoted 4 lines
misc.c is bloated with random crap already, I would like to keep things
orderly a little. Let's keep the board code and platform code separated.
Initial thinking misc.c should be as lean as possible but that seems not today. Can consider split them out per features such as usb.c ethernet.c.

There is no ethernet/usb... anything in misc.c and there shouldn't be. All of this stuff is (or should be) probed from OF :-)

Best regards,
Marek Vasut

Chin Liang See

2015-12-07 14:29 UTC #16 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 21 lines · Marek Vasut

Quoted 20 lines · Chin Liang See
Quoted 18 lines · Marek Vasut
On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:
[...]
Quoted 8 lines
arch/arm/mach-socfpga/board.c
Quoted 6 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.
misc.c is bloated with random crap already, I would like to keep things
orderly a little. Let's keep the board code and platform code separated.

Quoted 8 lines

Quoted 4 lines
Initial thinking misc.c should be as lean as possible but that seems
not today. Can consider split them out per features such as usb.c ethernet.c.
There is no ethernet/usb... anything in misc.c and there shouldn't be.
All of this stuff is (or should be) probed from OF :-)

Looking at misc.c, yup, they are specific to socfpga such as system manager emac registers. Till then, good from me

Acked-by Chin Liang See <[email protected]>

Thanks
Chin Liang

Quoted 3 lines

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-07 14:37 UTC #17 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 27 lines · Chin Liang See

Quoted 26 lines · Marek Vasut
Quoted 24 lines · Chin Liang See
Quoted 14 lines · Marek Vasut
On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:
[...]
Quoted 8 lines
arch/arm/mach-socfpga/board.c
Quoted 6 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.
Quoted 4 lines
misc.c is bloated with random crap already, I would like to keep things
orderly a little. Let's keep the board code and platform code separated.
Initial thinking misc.c should be as lean as possible but that seems
not today. Can consider split them out per features such as usb.c ethernet.c.

Quoted 6 lines

Quoted 3 lines
There is no ethernet/usb... anything in misc.c and there shouldn't be.
All of this stuff is (or should be) probed from OF :-)
Looking at misc.c, yup, they are specific to socfpga such as system manager emac registers. Till then, good from me

The cpu_eth_init() could use improvement, but we don't support generic reset handling yet I believe. That's the only thing which is obviously visible there, which could be improved.

The other thing which might use improvement is the FPGA registration, I suspect that might recycle the bindings from current linux 4.4.x at some point and move to DT as well.

Best regards,
Marek Vasut

Chin Liang See

2015-12-07 14:56 UTC #18 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 46 lines · Marek Vasut

Quoted 31 lines · Chin Liang See
Quoted 30 lines · Marek Vasut
Quoted 27 lines · Chin Liang See
Quoted 15 lines · Marek Vasut
On Monday, December 07, 2015 at 01:53:48 PM, Chin Liang See wrote:
[...]
Quoted 9 lines
arch/arm/mach-socfpga/board.c
Quoted 7 lines
arch/arm/mach renamed from arch/arm/mach-socfpga/board.c +0 -1
-socfpga/board.c
new file mode 100644
index 0000000..a41d089
arch/arm/mach-socfpga/board.c new file +0 -0
I am thinking this can go into misc.c instead new file.
Quoted 5 lines
misc.c is bloated with random crap already, I would like to keep
things
orderly a little. Let's keep the board code and platform code separated.
Initial thinking misc.c should be as lean as possible but that seems
not today. Can consider split them out per features such as usb.c
ethernet.c.
Quoted 7 lines
Quoted 4 lines
There is no ethernet/usb... anything in misc.c and there shouldn't
be.
All of this stuff is (or should be) probed from OF :-)
Looking at misc.c, yup, they are specific to socfpga such as system manager emac registers. Till then, good from me
The cpu_eth_init() could use improvement, but we don't support generic
reset handling yet I believe. That's the only thing which is obviously
visible there, which could be improved.

Quoted 4 lines

The other thing which might use improvement is the FPGA registration, I suspect that might recycle the bindings from current linux 4.4.x at some point and move to DT as well.

Nice, looking forward then :)

To further clean-up, I am thinking we can move do_bridge to reset_manager.c too. I can do this if it sound good to you.

Thanks
Chin Liang

Quoted 2 lines

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-07 17:46 UTC #19 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

On Monday, December 07, 2015 at 03:56:01 PM, Chin Liang See wrote:
[...]

Quoted 6 lines

Quoted 6 lines
The cpu_eth_init() could use improvement, but we don't support generic
reset handling yet I believe. That's the only thing which is obviously
visible there, which could be improved.

Quoted 8 lines

Quoted 3 lines
The other thing which might use improvement is the FPGA registration, I suspect that might recycle the bindings from current linux 4.4.x at some point and move to DT as well.
Nice, looking forward then :)
To further clean-up, I am thinking we can move do_bridge to reset_manager.c too. I can do this if it sound good to you.

It's not reset-manager specific though, is it ?

Best regards,
Marek Vasut

Chin Liang See

2015-12-08 12:34 UTC #20 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 14 lines · Marek Vasut

On Monday, December 07, 2015 at 03:56:01 PM, Chin Liang See wrote:
[...]
Quoted 12 lines
Quoted 11 lines
The cpu_eth_init() could use improvement, but we don't support generic
reset handling yet I believe. That's the only thing which is obviously
visible there, which could be improved.
The other thing which might use improvement is the FPGA registration,
I suspect that might recycle the bindings from current linux 4.4.x at
some point and move to DT as well.

Quoted 7 lines

Quoted 4 lines
Nice, looking forward then :)
To further clean-up, I am thinking we can move do_bridge to reset_manager.c too. I can do this if it sound good to you.
It's not reset-manager specific though, is it ?

All bridges are still release through reset manager except the fpga2sdram. Since we bridge assert at reset manager, consolidating these deassert function will make misc.c cleaner.

Thanks
Chin Liang

Quoted 2 lines

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-08 12:57 UTC #21 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 18 lines · Chin Liang See

Quoted 17 lines · Marek Vasut
On Monday, December 07, 2015 at 03:56:01 PM, Chin Liang See wrote:
[...]
Quoted 14 lines
Quoted 11 lines
The cpu_eth_init() could use improvement, but we don't support generic
reset handling yet I believe. That's the only thing which is obviously
visible there, which could be improved.
The other thing which might use improvement is the FPGA registration,
I suspect that might recycle the bindings from current linux 4.4.x at
some point and move to DT as well.
Nice, looking forward then :)

Quoted 8 lines

Quoted 4 lines
Quoted 2 lines
To further clean-up, I am thinking we can move do_bridge to reset_manager.c too. I can do this if it sound good to you.
It's not reset-manager specific though, is it ?
All bridges are still release through reset manager except the fpga2sdram. Since we bridge assert at reset manager, consolidating these deassert function will make misc.c cleaner.

OK, it might be better if we discuss this over a patch, so let's see how that looks.

Best regards,
Marek Vasut

Chin Liang See

2015-12-09 13:46 UTC #22 lore raw

PATCH 5/6 arm: socfpga: Introduce common board code

Quoted 24 lines · Marek Vasut

Quoted 23 lines · Chin Liang See
Quoted 22 lines · Marek Vasut
On Monday, December 07, 2015 at 03:56:01 PM, Chin Liang See wrote:
[...]
Quoted 17 lines
Quoted 7 lines
The cpu_eth_init() could use improvement, but we don't support
generic
reset handling yet I believe. That's the only thing which is obviously
visible there, which could be improved.
Quoted 5 lines
The other thing which might use improvement is the FPGA registration,
I suspect that might recycle the bindings from current linux 4.4.x at
some point and move to DT as well.
Nice, looking forward then :)
To further clean-up, I am thinking we can move do_bridge to reset_manager.c too. I can do this if it sound good to you.

Quoted 9 lines

Quoted 5 lines
Quoted 1 line
It's not reset-manager specific though, is it ?
All bridges are still release through reset manager except the fpga2sdram. Since we bridge assert at reset manager, consolidating these deassert function will make misc.c cleaner.
OK, it might be better if we discuss this over a patch, so let's see how that looks.

Sure

Thanks
Chin Liang

Quoted 2 lines

Best regards,
Marek Vasut

Marek Vasut

author

2015-12-05 20:44 UTC #23 lore raw

PATCH 6/6 arm: socfpga: Drop the board boilerplate

In reply to Marek Vasut

Drop all the common board code, since it is not completely useless.

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 board/altera/arria5-socdk/socfpga.c   | 56 -----------------------------------
 board/altera/cyclone5-socdk/socfpga.c | 56 -----------------------------------
 board/denx/mcvevk/socfpga.c           | 56 -----------------------------------
 board/ebv/socrates/socfpga.c          | 56 -----------------------------------
 board/sr1500/socfpga.c                | 17 -----------
 board/terasic/de0-nano-soc/socfpga.c  | 16 ----------
 board/terasic/sockit/socfpga.c        | 56 -----------------------------------
 7 files changed, 313 deletions(-)

board/altera/arria5-socdk/socfpga.c +0 ~~-56~~

index 449f3b5..97fb902 100644
@@ -3,60 +3,4 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
-
 #include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
-	/* Address of boot parameters for ATAG (if ATAG is used) */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}
-
-#ifdef CONFIG_USB_GADGET
-struct dwc2_plat_otg_data socfpga_otg_data = {
-	.usb_gusbcfg	= 0x1417,
-};
-
-int board_usb_init(int index, enum usb_init_type init)
-{
-	int node[2], count;
-	fdt_addr_t addr;
-
-	count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
-					   COMPAT_ALTERA_SOCFPGA_DWC2USB,
-					   node, 2);
-	if (count <= 0)	/* No controller found. */
-		return 0;
-
-	addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
-	if (addr == FDT_ADDR_T_NONE) {
-		printf("UDC Controller has no 'reg' property!\n");
-		return -EINVAL;
-	}
-
-	/* Patch the address from OF into the controller pdata. */
-	socfpga_otg_data.regs_otg = addr;
-
-	return dwc2_udc_probe(&socfpga_otg_data);
-}
-
-int g_dnl_board_usb_cable_connected(void)
-{
-	return 1;
-}
-#endif

board/altera/cyclone5-socdk/socfpga.c +0 ~~-56~~

60 lines not on this page · raw message

board/denx/mcvevk/socfpga.c +0 ~~-56~~

60 lines not on this page · raw message

board/ebv/socrates/socfpga.c +0 ~~-56~~

60 lines not on this page · raw message

board/sr1500/socfpga.c +0 ~~-17~~

index 9f89584..617dffa 100644
@@ -5,27 +5,10 @@
  */
 
 #include <common.h>
-#include <i2c.h>
-#include <miiphy.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
-	/* Address of boot parameters for ATAG (if ATAG is used) */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}
-
 int board_early_init_f(void)
 {
 	int ret;

board/terasic/de0-nano-soc/socfpga.c +0 ~~-16~~

index 3ccc2a7..97fb902 100644
@@ -3,20 +3,4 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
-
 #include <common.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
-	/* Address of boot parameters for ATAG (if ATAG is used) */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}

board/terasic/sockit/socfpga.c +0 ~~-56~~

60 lines not on this page · raw message

Signature · 1 line

2.1.4

Chin Liang See

2015-12-07 12:56 UTC #24 lore raw

PATCH 6/6 arm: socfpga: Drop the board boilerplate

Quoted 42 lines · Marek Vasut

Drop all the common board code, since it is not completely useless.

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---
 board/altera/arria5-socdk/socfpga.c   | 56 -------------------------
----------
 board/altera/cyclone5-socdk/socfpga.c | 56 -------------------------
----------
 board/denx/mcvevk/socfpga.c           | 56 -------------------------
----------
 board/ebv/socrates/socfpga.c          | 56 -------------------------
----------
 board/sr1500/socfpga.c                | 17 -----------
 board/terasic/de0-nano-soc/socfpga.c  | 16 ----------
 board/terasic/sockit/socfpga.c        | 56 -------------------------
----------
 7 files changed, 313 deletions(-)

board/altera/arria5-socdk/socfpga.c +0 ~~-12~~

index 449f3b5..97fb902 100644
@@ -3,60 +3,4 @@
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
-
 #include <common.h>
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-

board/altera/arria5-socdk/socfpga.c line 28

Quoted 10 lines

board/altera/arria5-socdk/socfpga.c +0 ~~-10~~

-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
-	/* Address of boot parameters for ATAG (if ATAG is used) */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}

Suggesting to keep the board_init function where user can put board specific initialization here.

Thanks
Chin Liang

Marek Vasut

author

2015-12-07 13:22 UTC #25 lore raw

PATCH 6/6 arm: socfpga: Drop the board boilerplate

Quoted 63 lines · Chin Liang See

Quoted 62 lines · Marek Vasut

Drop all the common board code, since it is not completely useless.

Signed-off-by Marek Vasut <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

---

 board/altera/arria5-socdk/socfpga.c   | 56 -------------------------

----------

 board/altera/cyclone5-socdk/socfpga.c | 56 -------------------------

----------

 board/denx/mcvevk/socfpga.c           | 56 -------------------------

----------

 board/ebv/socrates/socfpga.c          | 56 -------------------------

----------

 board/sr1500/socfpga.c                | 17 -----------
 board/terasic/de0-nano-soc/socfpga.c  | 16 ----------
 board/terasic/sockit/socfpga.c        | 56 -------------------------

----------

 7 files changed, 313 deletions(-)

board/altera/arria5-socdk/socfpga.c +0 ~~-17~~

index 449f3b5..97fb902 100644
@@ -3,60 +3,4 @@
 
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-
 
 #include <common.h>
 
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{

Quoted 8 lines

board/altera/arria5-socdk/socfpga.c line 28
Quoted 5 lines
board/altera/arria5-socdk/socfpga.c +0 -5
-	/* Address of boot parameters for ATAG (if ATAG is used) */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}
Suggesting to keep the board_init function where user can put board specific initialization here.

If the need for that ever arises, you can make the board_init in board.c __weak and override it here. But there should be no need for any board specific init, the DT should be the only place where such things should be described.

Chin Liang See

2015-12-07 13:29 UTC #26 lore raw

PATCH 6/6 arm: socfpga: Drop the board boilerplate

Quoted 80 lines · Marek Vasut

Quoted 70 lines · Chin Liang See
Quoted 69 lines · Marek Vasut
Drop all the common board code, since it is not completely useless.
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 board/altera/arria5-socdk/socfpga.c   | 56 ---------------------
----
----------
 board/altera/cyclone5-socdk/socfpga.c | 56 ---------------------
----
----------
 board/denx/mcvevk/socfpga.c           | 56 ---------------------
----
----------
 board/ebv/socrates/socfpga.c          | 56 ---------------------
----
----------
 board/sr1500/socfpga.c                | 17 -----------
 board/terasic/de0-nano-soc/socfpga.c  | 16 ----------
 board/terasic/sockit/socfpga.c        | 56 ---------------------
----
----------
 7 files changed, 313 deletions(-)
board/altera/arria5-socdk/socfpga.c +0 ~~-18~~
index 449f3b5..97fb902 100644
@@ -3,60 +3,4 @@
 
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-
 
 #include <common.h>
 
-#include <errno.h>
-#include <asm/arch/reset_manager.h>
-#include <asm/io.h>
-
-#include <usb.h>
-#include <usb/dwc2_udc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void s_init(void) {}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-int board_init(void)
-{
-	/* Address of boot parameters for ATAG (if ATAG is used)
Quoted 8 lines
board/altera/arria5-socdk/socfpga.c line 28
Quoted 5 lines
*/
board/altera/arria5-socdk/socfpga.c +0 -4
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	return 0;
-}
Suggesting to keep the board_init function where user can put board specific initialization here.

Quoted 7 lines

If the need for that ever arises, you can make the board_init in board.c
__weak and override it here. But there should be no need for any board
specific init, the DT should be the only place where such things should
be described.

Sound good to me as I dun have strong opinion on this. Will see anyone would need that too :)

Acked-by Chin Liang See <[email protected]>

Thanks
Chin Liang

Chin Liang See

2015-12-07 06:11 UTC #27 lore raw

PATCH 1/6 arm: socfpga: de0_nano: Zap VIRTUAL_TARGET

In reply to Marek Vasut

Quoted 9 lines · Marek Vasut

There is no VT for this board, so remove this incorrect macro.
Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
---
 include/configs/socfpga_de0_nano_soc.h | 4 ----
 1 file changed, 4 deletions(-)

Reviewed-by Chin Liang See <[email protected]>

Thanks
Chin Liang