diff mbox

[U-Boot,RFC,03/13] sunxi: Replace the pcDuino3 config with FDT version

Message ID 1425227620-6656-3-git-send-email-sjg@chromium.org
State RFC
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass March 1, 2015, 4:33 p.m. UTC
We currently have Linksprite_pcDuino3 and Linksprite_pcDuino3_fdt. Drop the
former in favour of the latter.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 configs/Linksprite_pcDuino3_defconfig     |  9 +++++++++
 configs/Linksprite_pcDuino3_fdt_defconfig | 18 ------------------
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 configs/Linksprite_pcDuino3_fdt_defconfig

Comments

Ian Campbell March 3, 2015, 8:34 a.m. UTC | #1
On Sun, 2015-03-01 at 09:33 -0700, Simon Glass wrote:
> We currently have Linksprite_pcDuino3 and Linksprite_pcDuino3_fdt. Drop the
> former in favour of the latter.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>

Is the FDT version a drop in replacement now? I didn't receive the whole
series but I see that e.g. patch #13 is switching to driver model for
Ethernet on this platform. Shouldn't this patch therefore come at the
end of the series after that groundwork has been laid?

_If_ I'm mistaken and this change at this point in the series is "no
functional change" then:
        Acked-by: Ian Campbell <ijc@hellion.org.uk>
        
Ian.
Hans de Goede March 3, 2015, 1:29 p.m. UTC | #2
Hi,

On 03-03-15 09:34, Ian Campbell wrote:
> On Sun, 2015-03-01 at 09:33 -0700, Simon Glass wrote:
>> We currently have Linksprite_pcDuino3 and Linksprite_pcDuino3_fdt. Drop the
>> former in favour of the latter.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>
> Is the FDT version a drop in replacement now?

AFAIK yes, this change was actually proposed by me since having 2 versions
makes no sense and in the long run we want to move everything to devicetree.

> I didn't receive the whole
> series but I see that e.g. patch #13 is switching to driver model for
> Ethernet on this platform. Shouldn't this patch therefore come at the
> end of the series after that groundwork has been laid?
>
> _If_ I'm mistaken and this change at this point in the series is "no
> functional change" then:
>          Acked-by: Ian Campbell <ijc@hellion.org.uk>

And also:

Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans
Simon Glass March 3, 2015, 2:01 p.m. UTC | #3
Hi,

On 3 March 2015 at 06:29, Hans de Goede <hdegoede@redhat.com> wrote:
> Hi,
>
> On 03-03-15 09:34, Ian Campbell wrote:
>>
>> On Sun, 2015-03-01 at 09:33 -0700, Simon Glass wrote:
>>>
>>> We currently have Linksprite_pcDuino3 and Linksprite_pcDuino3_fdt. Drop
>>> the
>>> former in favour of the latter.
>>>
>>> Signed-off-by: Simon Glass <sjg@chromium.org>
>>
>>
>> Is the FDT version a drop in replacement now?
>
>
> AFAIK yes, this change was actually proposed by me since having 2 versions
> makes no sense and in the long run we want to move everything to devicetree.

Yes that's the intent. I did the initial version as a separate board
to allow it to be compared.

>
>> I didn't receive the whole
>> series but I see that e.g. patch #13 is switching to driver model for
>> Ethernet on this platform. Shouldn't this patch therefore come at the
>> end of the series after that groundwork has been laid?

I could have sent that as a separate patch. It does not depend on the
Ethernet conversion though.

>>
>> _If_ I'm mistaken and this change at this point in the series is "no
>> functional change" then:
>>          Acked-by: Ian Campbell <ijc@hellion.org.uk>
>
>
> And also:
>
> Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,
Simon
diff mbox

Patch

diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 45d88f3..cf9e090 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -1,9 +1,18 @@ 
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
+CONFIG_DM=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_DISABLE_OF_CONTROL=y
+CONFIG_OF_SEPARATE=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN7I=y
 +S:CONFIG_DRAM_CLK=480
 +S:CONFIG_DRAM_ZQ=122
 +S:CONFIG_DRAM_EMR1=4
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400
diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig
deleted file mode 100644
index cf9e090..0000000
--- a/configs/Linksprite_pcDuino3_fdt_defconfig
+++ /dev/null
@@ -1,18 +0,0 @@ 
-CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
-CONFIG_DM=y
-CONFIG_DM_GPIO=y
-CONFIG_DM_SERIAL=y
-CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
-CONFIG_OF_CONTROL=y
-CONFIG_SPL_DISABLE_OF_CONTROL=y
-CONFIG_OF_SEPARATE=y
-+S:CONFIG_ARM=y
-+S:CONFIG_ARCH_SUNXI=y
-+S:CONFIG_MACH_SUN7I=y
-+S:CONFIG_DRAM_CLK=480
-+S:CONFIG_DRAM_ZQ=122
-+S:CONFIG_DRAM_EMR1=4
-CONFIG_SYS_MALLOC_F=y
-CONFIG_SYS_MALLOC_F_LEN=0x400