mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] ENV: remove kernelimage_type from env/config
@ 2012-03-09  9:30 Jan Weitzel
  2012-03-13 12:36 ` Sascha Hauer
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Weitzel @ 2012-03-09  9:30 UTC (permalink / raw)
  To: barebox

drop kernelimage_type bootm now boots all of them.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
 arch/arm/boards/at91sam9260ek/env/config |    5 -----
 arch/openrisc/boards/generic/env/config  |    1 -
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boards/at91sam9260ek/env/config b/arch/arm/boards/at91sam9260ek/env/config
index ba14c2b..8db18ef 100644
--- a/arch/arm/boards/at91sam9260ek/env/config
+++ b/arch/arm/boards/at91sam9260ek/env/config
@@ -19,14 +19,9 @@ rootfs_loc=net
 rootfs_type=ubifs
 rootfsimage=root.$rootfs_type
 
-# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
-#kernelimage_type=zimage
 #kernelimage=zImage
-kernelimage_type=uimage
 kernelimage=uImage
-#kernelimage_type=raw
 #kernelimage=Image
-#kernelimage_type=raw_lzo
 #kernelimage=Image.lzo
 
 nand_device=atmel_nand
diff --git a/arch/openrisc/boards/generic/env/config b/arch/openrisc/boards/generic/env/config
index 9dee8d9..4027f27 100644
--- a/arch/openrisc/boards/generic/env/config
+++ b/arch/openrisc/boards/generic/env/config
@@ -5,7 +5,6 @@ kernel=flash
 root=flash
 
 kernel_loc=nor
-kernelimage_type=uimage
 
 # use 'dhcp' todo dhcp in barebox and in kernel
 ip=none
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ENV: remove kernelimage_type from env/config
  2012-03-09  9:30 [PATCH] ENV: remove kernelimage_type from env/config Jan Weitzel
@ 2012-03-13 12:36 ` Sascha Hauer
  0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-03-13 12:36 UTC (permalink / raw)
  To: Jan Weitzel; +Cc: barebox

On Fri, Mar 09, 2012 at 10:30:56AM +0100, Jan Weitzel wrote:
> drop kernelimage_type bootm now boots all of them.
> 
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>

Applied, thanks

Sascha

> ---
>  arch/arm/boards/at91sam9260ek/env/config |    5 -----
>  arch/openrisc/boards/generic/env/config  |    1 -
>  2 files changed, 0 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/boards/at91sam9260ek/env/config b/arch/arm/boards/at91sam9260ek/env/config
> index ba14c2b..8db18ef 100644
> --- a/arch/arm/boards/at91sam9260ek/env/config
> +++ b/arch/arm/boards/at91sam9260ek/env/config
> @@ -19,14 +19,9 @@ rootfs_loc=net
>  rootfs_type=ubifs
>  rootfsimage=root.$rootfs_type
>  
> -# The image type of the kernel. Can be uimage, zimage, raw, or raw_lzo
> -#kernelimage_type=zimage
>  #kernelimage=zImage
> -kernelimage_type=uimage
>  kernelimage=uImage
> -#kernelimage_type=raw
>  #kernelimage=Image
> -#kernelimage_type=raw_lzo
>  #kernelimage=Image.lzo
>  
>  nand_device=atmel_nand
> diff --git a/arch/openrisc/boards/generic/env/config b/arch/openrisc/boards/generic/env/config
> index 9dee8d9..4027f27 100644
> --- a/arch/openrisc/boards/generic/env/config
> +++ b/arch/openrisc/boards/generic/env/config
> @@ -5,7 +5,6 @@ kernel=flash
>  root=flash
>  
>  kernel_loc=nor
> -kernelimage_type=uimage
>  
>  # use 'dhcp' todo dhcp in barebox and in kernel
>  ip=none
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-03-13 12:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-09  9:30 [PATCH] ENV: remove kernelimage_type from env/config Jan Weitzel
2012-03-13 12:36 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox