All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h
@ 2014-04-10 21:17 Rob Herring
  2014-04-10 21:17 ` [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt Rob Herring
  2014-05-02 13:09 ` [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Albert ARIBAUD
  0 siblings, 2 replies; 4+ messages in thread
From: Rob Herring @ 2014-04-10 21:17 UTC (permalink / raw)
  To: u-boot

From: Rob Herring <robh@kernel.org>

Adapt highbank to use config_distro_defaults.h and remove the redundant
defines.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 include/configs/highbank.h | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 7dbee3c..f8794dc 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -7,15 +7,15 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+#include <config_distro_defaults.h>
+
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_SYS_THUMB_BUILD
 
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_OF_LIBFDT
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_FIT
-#define CONFIG_SUPPORT_RAW_INITRD
 #define CONFIG_SYS_BOOTMAPSZ		(16 << 20)
 
 #define CONFIG_SYS_TIMER_RATE		(150000000/256)
@@ -48,35 +48,18 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 					CONFIG_SYS_SCSI_MAX_LUN)
 
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 #define CONFIG_CALXEDA_XGMAC
 
-/* PXE support */
-#define CONFIG_BOOTP_PXE
-#define CONFIG_BOOTP_PXE_CLIENTARCH	0x100
-#define CONFIG_BOOTP_VCI_STRING		"U-boot.armv7.highbank"
-
 /*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_BDI
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_LOADS
 #define CONFIG_CMD_SCSI
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_PXE
-#define CONFIG_MENU
 
-#define CONFIG_BOOTDELAY		2
 #define CONFIG_BOOT_RETRY_TIME		-1
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_AUTOBOOT_KEYED
@@ -85,14 +68,10 @@
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_LONGHELP		/* undef to save memory		 */
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of cmd args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_PROMPT		"Highbank #"
-#define CONFIG_SYS_HUSH_PARSER
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT)+16)
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt
  2014-04-10 21:17 [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Rob Herring
@ 2014-04-10 21:17 ` Rob Herring
  2014-05-02 13:09   ` Albert ARIBAUD
  2014-05-02 13:09 ` [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Albert ARIBAUD
  1 sibling, 1 reply; 4+ messages in thread
From: Rob Herring @ 2014-04-10 21:17 UTC (permalink / raw)
  To: u-boot

From: Rob Herring <robh@kernel.org>

Since highbank is actually shared between Highbank and Midway platforms,
remove the Highbank name from the prompt and use the default.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 include/configs/highbank.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index f8794dc..a6202cf 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -71,7 +71,6 @@
 #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
 #define CONFIG_SYS_MAXARGS		16	/* max number of cmd args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PROMPT		"Highbank #"
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					 sizeof(CONFIG_SYS_PROMPT)+16)
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h
  2014-04-10 21:17 [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Rob Herring
  2014-04-10 21:17 ` [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt Rob Herring
@ 2014-05-02 13:09 ` Albert ARIBAUD
  1 sibling, 0 replies; 4+ messages in thread
From: Albert ARIBAUD @ 2014-05-02 13:09 UTC (permalink / raw)
  To: u-boot

Hi Rob,

On Thu, 10 Apr 2014 16:17:30 -0500, Rob Herring <robherring2@gmail.com>
wrote:

> From: Rob Herring <robh@kernel.org>
> 
> Adapt highbank to use config_distro_defaults.h and remove the redundant
> defines.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  include/configs/highbank.h | 25 ++-----------------------
>  1 file changed, 2 insertions(+), 23 deletions(-)
> 
> diff --git a/include/configs/highbank.h b/include/configs/highbank.h
> index 7dbee3c..f8794dc 100644
> --- a/include/configs/highbank.h
> +++ b/include/configs/highbank.h
> @@ -7,15 +7,15 @@
>  #ifndef __CONFIG_H
>  #define __CONFIG_H
>  
> +#include <config_distro_defaults.h>
> +
>  #define CONFIG_SYS_DCACHE_OFF
>  #define CONFIG_SYS_THUMB_BUILD
>  
>  #define CONFIG_SYS_NO_FLASH
>  
> -#define CONFIG_OF_LIBFDT
>  #define CONFIG_OF_BOARD_SETUP
>  #define CONFIG_FIT
> -#define CONFIG_SUPPORT_RAW_INITRD
>  #define CONFIG_SYS_BOOTMAPSZ		(16 << 20)
>  
>  #define CONFIG_SYS_TIMER_RATE		(150000000/256)
> @@ -48,35 +48,18 @@
>  #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
>  					CONFIG_SYS_SCSI_MAX_LUN)
>  
> -#define CONFIG_DOS_PARTITION
> -#define CONFIG_EFI_PARTITION
> -
>  #define CONFIG_CALXEDA_XGMAC
>  
> -/* PXE support */
> -#define CONFIG_BOOTP_PXE
> -#define CONFIG_BOOTP_PXE_CLIENTARCH	0x100
> -#define CONFIG_BOOTP_VCI_STRING		"U-boot.armv7.highbank"
> -
>  /*
>   * Command line configuration.
>   */
>  #include <config_cmd_default.h>
>  
>  #define CONFIG_CMD_BDI
> -#define CONFIG_CMD_BOOTZ
> -#define CONFIG_CMD_DHCP
> -#define CONFIG_CMD_ELF
>  #define CONFIG_CMD_MEMORY
>  #define CONFIG_CMD_LOADS
>  #define CONFIG_CMD_SCSI
> -#define CONFIG_CMD_EXT2
> -#define CONFIG_CMD_EXT4
> -#define CONFIG_CMD_FAT
> -#define CONFIG_CMD_PXE
> -#define CONFIG_MENU
>  
> -#define CONFIG_BOOTDELAY		2
>  #define CONFIG_BOOT_RETRY_TIME		-1
>  #define CONFIG_RESET_TO_RETRY
>  #define CONFIG_AUTOBOOT_KEYED
> @@ -85,14 +68,10 @@
>  /*
>   * Miscellaneous configurable options
>   */
> -#define CONFIG_CMDLINE_EDITING
> -#define CONFIG_AUTO_COMPLETE
> -#define CONFIG_SYS_LONGHELP		/* undef to save memory		 */
>  #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_MAXARGS		16	/* max number of cmd args */
>  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
>  #define CONFIG_SYS_PROMPT		"Highbank #"
> -#define CONFIG_SYS_HUSH_PARSER
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					 sizeof(CONFIG_SYS_PROMPT)+16)

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt
  2014-04-10 21:17 ` [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt Rob Herring
@ 2014-05-02 13:09   ` Albert ARIBAUD
  0 siblings, 0 replies; 4+ messages in thread
From: Albert ARIBAUD @ 2014-05-02 13:09 UTC (permalink / raw)
  To: u-boot

Hi Rob,

On Thu, 10 Apr 2014 16:17:31 -0500, Rob Herring <robherring2@gmail.com>
wrote:

> From: Rob Herring <robh@kernel.org>
> 
> Since highbank is actually shared between Highbank and Midway platforms,
> remove the Highbank name from the prompt and use the default.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  include/configs/highbank.h | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/include/configs/highbank.h b/include/configs/highbank.h
> index f8794dc..a6202cf 100644
> --- a/include/configs/highbank.h
> +++ b/include/configs/highbank.h
> @@ -71,7 +71,6 @@
>  #define CONFIG_SYS_CBSIZE		1024	/* Console I/O Buffer Size */
>  #define CONFIG_SYS_MAXARGS		16	/* max number of cmd args */
>  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
> -#define CONFIG_SYS_PROMPT		"Highbank #"
>  /* Print Buffer Size */
>  #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
>  					 sizeof(CONFIG_SYS_PROMPT)+16)

Applied to u-boot-arm/master, thanks!

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-02 13:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-10 21:17 [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Rob Herring
2014-04-10 21:17 ` [U-Boot] [PATCH 2/2] ARM: highbank: use default prompt Rob Herring
2014-05-02 13:09   ` Albert ARIBAUD
2014-05-02 13:09 ` [U-Boot] [PATCH 1/2] ARM: highbank: use config_distro_defaults.h Albert ARIBAUD

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.