Re: [U-Boot] [PATCH 2/2] at91: cleanup taurus port
Hello Eugen, Am 12.04.2019 um 15:52 schrieb Heiko Schocher: Hello Eugen, Am 12.04.2019 um 15:07 schrieb eugen.hris...@microchip.com: On 12.04.2019 15:53, Heiko Schocher wrote: External E-Mail Hello eugen, Am 12.04.2019 um 13:24 schrieb eugen.hris...@microchip.com: On 11.04.2019 08:53, Heiko Schocher wrote: - at91sam9g20-taurus.dts: use labels - cleanup taurus port to compile clean with current mainline again. SPL has no serial output anymore, so it fits into SRAM. Signed-off-by: Heiko Schocher [snip] Hello Heiko, This patch has several issues: taurus_defconfig +spl/dts/dt-platdata.c:11:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_ahb = { + ^ +spl/dts/dt-platdata.c:20:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_apb = { +cc1: all warnings being treated as errors +make[2]: *** [spl/dts/dt-platdata.o] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ah, I had not warnings as errors active ... sorry for this! Hmmm: in generated ./include/generated/dt-structs-gen.h struct dtd_simple_bus { bool ranges; }; True but at line #44 you have #define dtd_simple_bus dtd_atmel_at91rm9200_pinctrl Which redefines things... indeed. As this is an autmatic generated file, I must look deeper into it! Hmm... following wip patch solves the warning: $ git diff diff --git a/arch/arm/dts/at91sam9260.dtsi b/arch/arm/dts/at91sam9260.dtsi index 800d96eb2f..551364513f 100644 --- a/arch/arm/dts/at91sam9260.dtsi +++ b/arch/arm/dts/at91sam9260.dtsi @@ -440,7 +440,7 @@ pinctrl: pinctrl@f400 { #address-cells = <1>; #size-cells = <1>; - compatible = "atmel,at91rm9200-pinctrl", "simple-bus"; + compatible = "atmel,at91rm9200-pinctrl"; ranges = <0xf400 0xf400 0x600>; reg = <0xf400 0x200 /* pioA */ 0xf600 0x200 /* pioB */ $ This prevents that the line with: #define dtd_simple_bus dtd_atmel_at91rm9200_pinctrl gets created, but I wonder why other boards do not have this warning. bye, Heiko bye, Heiko and in spl/dts/dt-platdata.c: #include static const struct dtd_simple_bus dtv_ahb = { .ranges = true, }; Do not see what is really wrong ... may friday afternoon ... and axm_defconfig : +drivers/built-in.o: In function `get_current': +drivers/serial/serial.c:318: undefined reference to `default_serial_console' +make[2]: *** [spl/u-boot-spl] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ups, sorry, just forgot to add this, update this in v2. Thanks for the review! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] at91: cleanup taurus port
Hello Eugen, Am 12.04.2019 um 15:07 schrieb eugen.hris...@microchip.com: On 12.04.2019 15:53, Heiko Schocher wrote: External E-Mail Hello eugen, Am 12.04.2019 um 13:24 schrieb eugen.hris...@microchip.com: On 11.04.2019 08:53, Heiko Schocher wrote: - at91sam9g20-taurus.dts: use labels - cleanup taurus port to compile clean with current mainline again. SPL has no serial output anymore, so it fits into SRAM. Signed-off-by: Heiko Schocher [snip] Hello Heiko, This patch has several issues: taurus_defconfig +spl/dts/dt-platdata.c:11:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_ahb = { + ^ +spl/dts/dt-platdata.c:20:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_apb = { +cc1: all warnings being treated as errors +make[2]: *** [spl/dts/dt-platdata.o] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ah, I had not warnings as errors active ... sorry for this! Hmmm: in generated ./include/generated/dt-structs-gen.h struct dtd_simple_bus { bool ranges; }; True but at line #44 you have #define dtd_simple_bus dtd_atmel_at91rm9200_pinctrl Which redefines things... indeed. As this is an autmatic generated file, I must look deeper into it! bye, Heiko and in spl/dts/dt-platdata.c: #include static const struct dtd_simple_bus dtv_ahb = { .ranges = true, }; Do not see what is really wrong ... may friday afternoon ... and axm_defconfig : +drivers/built-in.o: In function `get_current': +drivers/serial/serial.c:318: undefined reference to `default_serial_console' +make[2]: *** [spl/u-boot-spl] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ups, sorry, just forgot to add this, update this in v2. Thanks for the review! bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] at91: cleanup taurus port
On 12.04.2019 15:53, Heiko Schocher wrote: > External E-Mail > > > Hello eugen, > > Am 12.04.2019 um 13:24 schrieb eugen.hris...@microchip.com: >> >> >> On 11.04.2019 08:53, Heiko Schocher wrote: >> >>> >>> - at91sam9g20-taurus.dts: use labels >>> - cleanup taurus port to compile clean with >>> current mainline again. SPL has no serial >>> output anymore, so it fits into SRAM. >>> >>> Signed-off-by: Heiko Schocher >> >> [snip] >> >> Hello Heiko, >> >> This patch has several issues: >> >> taurus_defconfig >> >> +spl/dts/dt-platdata.c:11:46: error: missing braces around initializer >> [-Werror=missing-braces] >> + static const struct dtd_simple_bus dtv_ahb = { >> + ^ >> +spl/dts/dt-platdata.c:20:46: error: missing braces around initializer >> [-Werror=missing-braces] >> + static const struct dtd_simple_bus dtv_apb = { >> +cc1: all warnings being treated as errors >> +make[2]: *** [spl/dts/dt-platdata.o] Error 1 >> +make[1]: *** [spl/u-boot-spl] Error 2 >> +make: *** [sub-make] Error 2 > > Ah, I had not warnings as errors active ... sorry for this! > > Hmmm: > > in generated ./include/generated/dt-structs-gen.h > > struct dtd_simple_bus { > bool ranges; > }; True but at line #44 you have #define dtd_simple_bus dtd_atmel_at91rm9200_pinctrl Which redefines things... > > and in spl/dts/dt-platdata.c: > > #include > > static const struct dtd_simple_bus dtv_ahb = { > .ranges = true, > }; > > Do not see what is really wrong ... may friday afternoon ... > >> and axm_defconfig : >> >> +drivers/built-in.o: In function `get_current': >> +drivers/serial/serial.c:318: undefined reference to >> `default_serial_console' >> +make[2]: *** [spl/u-boot-spl] Error 1 >> +make[1]: *** [spl/u-boot-spl] Error 2 >> +make: *** [sub-make] Error 2 > > Ups, sorry, just forgot to add this, update this in v2. > > Thanks for the review! > > bye, > Heiko ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] at91: cleanup taurus port
Hello eugen, Am 12.04.2019 um 13:24 schrieb eugen.hris...@microchip.com: On 11.04.2019 08:53, Heiko Schocher wrote: - at91sam9g20-taurus.dts: use labels - cleanup taurus port to compile clean with current mainline again. SPL has no serial output anymore, so it fits into SRAM. Signed-off-by: Heiko Schocher [snip] Hello Heiko, This patch has several issues: taurus_defconfig +spl/dts/dt-platdata.c:11:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_ahb = { + ^ +spl/dts/dt-platdata.c:20:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_apb = { +cc1: all warnings being treated as errors +make[2]: *** [spl/dts/dt-platdata.o] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ah, I had not warnings as errors active ... sorry for this! Hmmm: in generated ./include/generated/dt-structs-gen.h struct dtd_simple_bus { boolranges; }; and in spl/dts/dt-platdata.c: #include static const struct dtd_simple_bus dtv_ahb = { .ranges = true, }; Do not see what is really wrong ... may friday afternoon ... and axm_defconfig : +drivers/built-in.o: In function `get_current': +drivers/serial/serial.c:318: undefined reference to `default_serial_console' +make[2]: *** [spl/u-boot-spl] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Ups, sorry, just forgot to add this, update this in v2. Thanks for the review! bye, Heiko -- -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: h...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] at91: cleanup taurus port
On 11.04.2019 08:53, Heiko Schocher wrote: > > - at91sam9g20-taurus.dts: use labels > - cleanup taurus port to compile clean with >current mainline again. SPL has no serial >output anymore, so it fits into SRAM. > > Signed-off-by: Heiko Schocher [snip] Hello Heiko, This patch has several issues: taurus_defconfig +spl/dts/dt-platdata.c:11:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_ahb = { + ^ +spl/dts/dt-platdata.c:20:46: error: missing braces around initializer [-Werror=missing-braces] + static const struct dtd_simple_bus dtv_apb = { +cc1: all warnings being treated as errors +make[2]: *** [spl/dts/dt-platdata.o] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 and axm_defconfig : +drivers/built-in.o: In function `get_current': +drivers/serial/serial.c:318: undefined reference to `default_serial_console' +make[2]: *** [spl/u-boot-spl] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Thanks, Eugen ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 2/2] at91: cleanup taurus port
- at91sam9g20-taurus.dts: use labels - cleanup taurus port to compile clean with current mainline again. SPL has no serial output anymore, so it fits into SRAM. Signed-off-by: Heiko Schocher --- arch/arm/dts/at91sam9g20-taurus.dts | 158 ++-- board/siemens/taurus/taurus.c | 4 +- configs/taurus_defconfig| 33 +- include/configs/taurus.h| 5 +- 4 files changed, 110 insertions(+), 90 deletions(-) diff --git a/arch/arm/dts/at91sam9g20-taurus.dts b/arch/arm/dts/at91sam9g20-taurus.dts index cee228bb8c..c00c5a8b8d 100644 --- a/arch/arm/dts/at91sam9g20-taurus.dts +++ b/arch/arm/dts/at91sam9g20-taurus.dts @@ -15,7 +15,7 @@ / { model = "Siemens taurus"; - compatible = "atmel,at91sam9g20ek", "atmel,at91sam9g20", "atmel,at91sam9"; + compatible = "atmel,at91sam9g20", "atmel,at91sam9"; chosen { u-boot,dm-pre-reloc; @@ -35,88 +35,86 @@ clock-frequency = <18432000>; }; }; +}; - ahb { - apb { - pinctrl@f400 { - board { - pinctrl_pck0_as_mck: pck0_as_mck { - atmel,pins = - ; /* PC1 periph B */ - }; - - }; - }; - - dbgu: serial@f200 { - u-boot,dm-pre-reloc; - status = "okay"; - }; - - usart0: serial@fffb { - pinctrl-0 = - <_usart0 -_usart0_rts -_usart0_cts -_usart0_dtr_dsr -_usart0_dcd -_usart0_ri>; - status = "okay"; - }; - - usart1: serial@fffb4000 { - status = "okay"; - }; - - macb0: ethernet@fffc4000 { - phy-mode = "rmii"; - status = "okay"; - }; - - usb1: gadget@fffa4000 { - atmel,vbus-gpio = < 5 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; - - ssc0: ssc@fffbc000 { - status = "okay"; - pinctrl-0 = <_ssc0_tx>; - }; - - spi0: spi@fffc8000 { - cs-gpios = <0>, < 11 0>, <0>, <0>; - mtd_dataflash@0 { - compatible = "atmel,at45", "atmel,dataflash"; - spi-max-frequency = <5000>; - reg = <1>; - }; - }; - - rtc@fd20 { - atmel,rtt-rtc-time-reg = < 0x0>; - status = "okay"; - }; - - watchdog@fd40 { - timeout-sec = <15>; - status = "okay"; - }; - - gpbr: syscon@fd50 { - status = "okay"; - }; - }; + { + status = "okay"; +}; - nand0: nand@4000 { - nand-bus-width = <8>; - nand-ecc-mode = "soft"; - nand-on-flash-bbt; - status = "okay"; - }; + { + status = "okay"; +}; + + { + phy-mode = "rmii"; + status = "okay"; +}; - usb0: ohci@0050 { - num-ports = <2>; - status = "okay"; + { + nand-bus-width = <8>; + nand-ecc-mode = "soft"; + nand-on-flash-bbt; + status = "okay"; +}; + + { + u-boot,dm-pre-reloc; + board { + pinctrl_pck0_as_mck: pck0_as_mck { + atmel,pins = + /* PC1 periph B */ + ; }; + }; }; + + { + atmel,rtt-rtc-time-reg = < 0x0>; + status = "okay"; +}; + + { + cs-gpios = <0>, < 11 0>, <0>, <0>; + mtd_dataflash@0 { + compatible = "atmel,at45", "atmel,dataflash"; + spi-max-frequency = <5000>; + reg = <1>; + }; +}; + + { + status = "okay"; + pinctrl-0 =