Skip to contentSkip to conversation

tegra: Remove merge markers in some Kconfig files

PATCH Superseded Simon Glass 4 participants 16 messages Dec 4, 2015 – Dec 6, 2015

Subsystems (3)
Arm (32-bit) Arm sub-architectures Tegra architecture support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Simon Glass

author
#0 lore raw

PATCH 1/4 tegra: Remove merge markers in some Kconfig files

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>

---

 configs/beaver_defconfig     | 3 ---
 configs/cardhu_defconfig     | 3 ---
 configs/jetson-tk1_defconfig | 3 ---
 configs/trimslice_defconfig  | 3 ---
 4 files changed, 12 deletions(-)
configs/beaver_defconfig +0 -3
index 2930344..8add08d 100644
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
configs/cardhu_defconfig +0 -3
index 5760018..c9f565a 100644
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
configs/jetson-tk1_defconfig +0 -3
index 9500d2c..efc4aee 100644
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA114_SPI=y
 CONFIG_USB=y
configs/trimslice_defconfig +0 -3
index ee40218..e34faa3 100644
@@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 # CONFIG_CMD_NFS is not set
 CONFIG_SPI_FLASH=y
-<<<<<<< HEAD
 CONFIG_SPI_FLASH_WINBOND=y
-=======
 CONFIG_PCI_TEGRA=y
->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SFLASH=y
 CONFIG_USB=y
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
author
#1 lore raw

PATCH 2/4 dm: serial: ns16550: Add pre-reloc flag to the driver

For platforms that don't use device tree in SPL the only way to mark this driver as 'required by relocation' is with the DM_FLAG_PRE_RELOC flag. Add this to ensure that the driver is bound.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>

---

 drivers/serial/ns16550.c | 1 +
 1 file changed, 1 insertion(+)
drivers/serial/ns16550.c +1 -0
index 166deab..256c7ea 100644
@@ -451,5 +451,6 @@ U_BOOT_DRIVER(ns16550_serial) = {
 	.priv_auto_alloc_size = sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
 };
 #endif /* CONFIG_DM_SERIAL */
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#2 lore raw

PATCH 2/4 dm: serial: ns16550: Add pre-reloc flag to the driver

Quoted 11 lines · Simon Glass

For platforms that don't use device tree in SPL the only way to mark this driver as 'required by relocation' is with the DM_FLAG_PRE_RELOC flag. Add this to ensure that the driver is bound.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>

---

  drivers/serial/ns16550.c | 1 +
  1 file changed, 1 insertion(+)
Acked-by Thomas Chou <[email protected]>
#3 lore raw

PATCH 2/4 dm: serial: ns16550: Add pre-reloc flag to the driver

In reply to Simon Glass
Quoted 8 lines · Simon Glass

For platforms that don't use device tree in SPL the only way to mark this driver as 'required by relocation' is with the DM_FLAG_PRE_RELOC flag. Add this to ensure that the driver is bound.

Fixes fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>
Acked-by Thomas Chou <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/4a495896/attachment.sig>
author
#4 lore raw

PATCH 3/4 dm: tegra: Provide serial platform data for SPL

In reply to Simon Glass

At present an incorrect #if term is preventing this data from being compiled in. All tegra boards use driver model for serial, so we can just drop this.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>

---

 arch/arm/mach-tegra/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-tegra/board.c +1 -1
index 8c8927d..3d1d26d 100644
@@ -214,7 +214,7 @@ void board_init_uart_f(void)
 	setup_uarts(uart_ids);
 }
 
-#if CONFIG_IS_ENABLED(DM_SERIAL) && !CONFIG_IS_ENABLED(OF_CONTROL)
+#if !CONFIG_IS_ENABLED(OF_CONTROL)
 static struct ns16550_platdata ns16550_com1_pdata = {
 	.base = CONFIG_SYS_NS16550_COM1,
 	.reg_shift = 2,
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#5 lore raw

PATCH 3/4 dm: tegra: Provide serial platform data for SPL

Quoted 10 lines · Simon Glass

At present an incorrect #if term is preventing this data from being compiled in. All tegra boards use driver model for serial, so we can just drop this.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>

---

  arch/arm/mach-tegra/board.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by Thomas Chou <[email protected]>
#6 lore raw

PATCH 3/4 dm: tegra: Provide serial platform data for SPL

In reply to Simon Glass
Quoted 7 lines · Simon Glass

At present an incorrect #if term is preventing this data from being compiled in. All tegra boards use driver model for serial, so we can just drop this.

Fixes fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>
Acked-by Thomas Chou <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/190c90ad/attachment.sig>
author
#7 lore raw

PATCH 4/4 dm: omap: Fix serial UART on beaglebone black

In reply to Simon Glass

This is currently broken since it does not have the reg-shift property for the UART in the device tree. Fix it.

Reported-by Yegor Yefremov <[email protected]>
Signed-off-by Simon Glass <[email protected]>

---

 arch/arm/dts/am33xx.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/dts/am33xx.dtsi +6 -0
index 21fcc44..b26e21b 100644
@@ -214,6 +214,7 @@
 			ti,hwmods = "uart1";
 			clock-frequency = <48000000>;
 			reg = <0x44e09000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <72>;
 			status = "disabled";
 			dmas = <&edma 26>, <&edma 27>;

@@ -225,6 +226,7 @@
 			ti,hwmods = "uart2";
 			clock-frequency = <48000000>;
 			reg = <0x48022000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <73>;
 			status = "disabled";
 			dmas = <&edma 28>, <&edma 29>;

@@ -236,6 +238,7 @@
 			ti,hwmods = "uart3";
 			clock-frequency = <48000000>;
 			reg = <0x48024000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <74>;
 			status = "disabled";
 			dmas = <&edma 30>, <&edma 31>;

@@ -247,6 +250,7 @@
 			ti,hwmods = "uart4";
 			clock-frequency = <48000000>;
 			reg = <0x481a6000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <44>;
 			status = "disabled";
 		};

@@ -256,6 +260,7 @@
 			ti,hwmods = "uart5";
 			clock-frequency = <48000000>;
 			reg = <0x481a8000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <45>;
 			status = "disabled";
 		};

@@ -265,6 +270,7 @@
 			ti,hwmods = "uart6";
 			clock-frequency = <48000000>;
 			reg = <0x481aa000 0x2000>;
+			reg-shift = <2>;
 			interrupts = <46>;
 			status = "disabled";
 		};
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
#9 lore raw

PATCH 4/4 dm: omap: Fix serial UART on beaglebone black

In reply to Simon Glass
Quoted 5 lines · Simon Glass

This is currently broken since it does not have the reg-shift property for the UART in the device tree. Fix it.

Reported-by Yegor Yefremov <[email protected]>
Signed-off-by Simon Glass <[email protected]>

OK, this isn't enough. Both this patch, and Mugunthan's more comprehensive one (That gets all TI targets) fails on the non-OF_CONTROL case.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/594a54dd/attachment.sig>
author
#10 lore raw

PATCH 4/4 dm: omap: Fix serial UART on beaglebone black

Hi Tom,

Quoted 6 lines · Tom Rini
Quoted 3 lines · Simon Glass

This is currently broken since it does not have the reg-shift property for the UART in the device tree. Fix it.

Quoted 6 lines
Quoted 2 lines
Reported-by Yegor Yefremov <[email protected]>
Signed-off-by Simon Glass <[email protected]>

OK, this isn't enough. Both this patch, and Mugunthan's more comprehensive one (That gets all TI targets) fails on the non-OF_CONTROL case.

Yes I see. I meant to test that case as well but ran out of time. I'll update the series.

Regards,
Simon

author
#12 lore raw

PATCH 1/4 tegra: Remove merge markers in some Kconfig files

Hi Stephen,

Quoted 6 lines · Stephen Warren
Quoted 3 lines · Simon Glass

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them.

Quoted 7 lines

Patches 1-3,

Tested-by Stephen Warren <[email protected]>

It would be useful to include the appropriate Fixes: tags in the commit message, and this issue was originally:

Reported-by Kevin Hilman <[email protected]>

Thanks - what Fixes tags?

Regards,
Simon

#13 lore raw

PATCH 1/4 tegra: Remove merge markers in some Kconfig files

Quoted 12 lines · Simon Glass

Hi Stephen,

Quoted 9 lines · Stephen Warren
Quoted 3 lines · Simon Glass

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them.

Patches 1-3,

Tested-by Stephen Warren <[email protected]>
Quoted 6 lines
Quoted 4 lines

It would be useful to include the appropriate Fixes: tags in the commit message, and this issue was originally:

Reported-by Kevin Hilman <[email protected]>

Thanks - what Fixes tags?

I'd expect the following at the start of the "signature paragraph":

Fixes fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")

Referencing in a standard way the commits that caused the bug that this patch fixes makes researching bug/commit history easier. Admittedly that tag is something from the Linux kernel development process and isn't mandated by U-Boot's process, but I think it's a good idea that's worth following.

#14 lore raw

PATCH 1/4 tegra: Remove merge markers in some Kconfig files

In reply to Simon Glass
Quoted 5 lines · Simon Glass

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them.

Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>
Quoted 8 lines

---

  configs/beaver_defconfig     | 3 ---
  configs/cardhu_defconfig     | 3 ---
  configs/jetson-tk1_defconfig | 3 ---
  configs/trimslice_defconfig  | 3 ---
  4 files changed, 12 deletions(-)
Acked-by Thomas Chou <[email protected]>
#15 lore raw

PATCH 1/4 tegra: Remove merge markers in some Kconfig files

In reply to Simon Glass
Quoted 9 lines · Simon Glass

These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them.

Fixes fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
Signed-off-by Simon Glass <[email protected]>
Reported-by Stephen Warren <[email protected]>
Tested-by Stephen Warren <[email protected]>
Reported-by Kevin Hilman <[email protected]>
Acked-by Thomas Chou <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/3dbcf8ea/attachment.sig>