diff mbox

[U-Boot] odroid: defconfig: fix build break caused by missing dts

Message ID 1425981179-16289-1-git-send-email-p.marczak@samsung.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Przemyslaw Marczak March 10, 2015, 9:52 a.m. UTC
The build break was caused by one of my previous commit:
'odroid: defconfig: disable memset at malloc init'

It removes the dts from odroid defconfig - rebase mistake.

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 configs/odroid_defconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Łukasz Majewski March 10, 2015, 11:01 a.m. UTC | #1
Hi Przemyslaw,

> The build break was caused by one of my previous commit:
> 'odroid: defconfig: disable memset at malloc init'
> 
> It removes the dts from odroid defconfig - rebase mistake.
> 
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> ---
>  configs/odroid_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index cfb29e0..d32b5b5 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_EXYNOS=y
>  CONFIG_TARGET_ODROID=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
>  CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Łukasz Majewski March 12, 2015, 8:58 a.m. UTC | #2
Hi Tom,

> The build break was caused by one of my previous commit:
> 'odroid: defconfig: disable memset at malloc init'
> 
> It removes the dts from odroid defconfig - rebase mistake.
> 
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> ---
>  configs/odroid_defconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> index cfb29e0..d32b5b5 100644
> --- a/configs/odroid_defconfig
> +++ b/configs/odroid_defconfig
> @@ -2,6 +2,7 @@ CONFIG_ARM=y
>  CONFIG_ARCH_EXYNOS=y
>  CONFIG_TARGET_ODROID=y
>  CONFIG_OF_CONTROL=y
> +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
>  CONFIG_DM_I2C=y
>  CONFIG_DM_I2C_COMPAT=y
>  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

Tom, could you fetch this fix patch ? Thanks in advance.
Minkyu Kang March 14, 2015, 2:25 p.m. UTC | #3
On 12 March 2015 at 17:58, Lukasz Majewski <l.majewski@samsung.com> wrote:

> Hi Tom,
>
> > The build break was caused by one of my previous commit:
> > 'odroid: defconfig: disable memset at malloc init'
> >
> > It removes the dts from odroid defconfig - rebase mistake.
> >
> > Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > ---
> >  configs/odroid_defconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
> > index cfb29e0..d32b5b5 100644
> > --- a/configs/odroid_defconfig
> > +++ b/configs/odroid_defconfig
> > @@ -2,6 +2,7 @@ CONFIG_ARM=y
> >  CONFIG_ARCH_EXYNOS=y
> >  CONFIG_TARGET_ODROID=y
> >  CONFIG_OF_CONTROL=y
> > +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
> >  CONFIG_DM_I2C=y
> >  CONFIG_DM_I2C_COMPAT=y
> >  # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>
> Tom, could you fetch this fix patch ? Thanks in advance.
>
> --
> Best regards,
>
> Lukasz Majewski
>
> Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>


Acked-by: Minkyu Kang <mk7.kang@samsung.com>
Tom Rini March 17, 2015, 1:01 p.m. UTC | #4
On Tue, Mar 10, 2015 at 10:52:59AM +0100, Przemyslaw Marczak wrote:

> The build break was caused by one of my previous commit:
> 'odroid: defconfig: disable memset at malloc init'
> 
> It removes the dts from odroid defconfig - rebase mistake.
> 
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> Acked-by: Lukasz Majewski <l.majewski@samsung.com>
> Acked-by: Minkyu Kang <mk7.kang@samsung.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig
index cfb29e0..d32b5b5 100644
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -2,6 +2,7 @@  CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID=y
 CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"
 CONFIG_DM_I2C=y
 CONFIG_DM_I2C_COMPAT=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set