board/BuR: split bur_am335x_common.h into am335x-specific and BuR common parts
bur_am335x_common.h today holds all common configuration which is shared over all B&R boards. In future we want to bring up boards which are not based on AM335x only but we still want to have common configuration over all B&R boards independent from their architecture. To prepare this we introduce a new file "bur_cfg_common.h", where we move all common things, which are not architecture specific, from bur_am335x_common.h. On B&R am335x boards we include from now: #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> On other B&R boards, we include only #include <configs/bur_cfg_common.h> Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at> Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Hannes Schmelzer
Tom Rini
parent
be0be08802
commit
3b804d94ab
@ -3,7 +3,7 @@
|
||||
*
|
||||
* common parts used by B&R AM335x based boards
|
||||
*
|
||||
* Copyright (C) 2013 Hannes Schmelzer <oe5hpm@oevsv.at> -
|
||||
* Copyright (C) 2016 Hannes Schmelzer <oe5hpm@oevsv.at> -
|
||||
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
@ -12,24 +12,9 @@
|
||||
#ifndef __BUR_AM335X_COMMON_H__
|
||||
#define __BUR_AM335X_COMMON_H__
|
||||
/* ------------------------------------------------------------------------- */
|
||||
#define BUR_COMMON_ENV \
|
||||
"usbscript=usb start && fatload usb 0 0x80000000 usbscript.img && source\0" \
|
||||
"brdefaultip=if test -r ${ipaddr}; then; else" \
|
||||
" setenv ipaddr 192.168.60.1; setenv serverip 192.168.60.254;" \
|
||||
" setenv gatewayip 192.168.60.254; setenv netmask 255.255.255.0; fi;\0" \
|
||||
"netconsole=echo switching to network console ...; " \
|
||||
"if dhcp; then; else run brdefaultip; fi; setenv ncip ${serverip}; " \
|
||||
"setcurs 1 9; lcdputs myip; setcurs 10 9; lcdputs ${ipaddr};" \
|
||||
"setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \
|
||||
"setenv stdout nc;setenv stdin nc;setenv stderr nc\0"
|
||||
|
||||
#define CONFIG_PREBOOT "run brdefaultip"
|
||||
|
||||
|
||||
#define CONFIG_AM33XX
|
||||
#define CONFIG_OMAP
|
||||
#define CONFIG_OMAP_COMMON
|
||||
#define CONFIG_BOARD_LATE_INIT
|
||||
#define CONFIG_SYS_CACHELINE_SIZE 64
|
||||
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
|
||||
|
||||
@ -52,17 +37,11 @@
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
|
||||
/* Network defines */
|
||||
#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
|
||||
#define CONFIG_BOOTP_SEND_HOSTNAME
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_SUBNETMASK
|
||||
#define CONFIG_NET_RETRY_COUNT 2
|
||||
#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */
|
||||
#define CONFIG_MII /* Required in net/eth.c */
|
||||
#define CONFIG_PHYLIB
|
||||
#define CONFIG_PHY_NATSEMI
|
||||
/* Network console */
|
||||
#define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */
|
||||
|
||||
/*
|
||||
* SPL related defines. The Public RAM memory map the ROM defines the
|
||||
* area between 0x402F0400 and 0x4030B800 as a download area and
|
||||
@ -103,38 +82,6 @@
|
||||
#define CONFIG_SYS_I2C_OMAP24XX
|
||||
/* GPIO */
|
||||
#define CONFIG_OMAP_GPIO
|
||||
/*
|
||||
* ----------------------------------------------------------------------------
|
||||
* The following are general good-enough settings for U-Boot. We set a
|
||||
* large malloc pool as we generally have a lot of DDR, and we opt for
|
||||
* function over binary size in the main portion of U-Boot as this is
|
||||
* generally easily constrained later if needed. We enable the config
|
||||
* options that give us information in the environment about what board
|
||||
* we are on so we do not need to rely on the command prompt. We set a
|
||||
* console baudrate of 115200 and use the default baud rate table.
|
||||
*/
|
||||
#define CONFIG_SYS_MALLOC_LEN (5120 << 10)
|
||||
#define CONFIG_SYS_CONSOLE_INFO_QUIET
|
||||
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
||||
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
|
||||
|
||||
/* As stated above, the following choices are optional. */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
#define CONFIG_VERSION_VARIABLE
|
||||
|
||||
/* We set the max number of command args high to avoid HUSH bugs. */
|
||||
#define CONFIG_SYS_MAXARGS 64
|
||||
|
||||
/* Console I/O Buffer Size */
|
||||
#define CONFIG_SYS_CBSIZE 512
|
||||
/* Print Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE +\
|
||||
sizeof(CONFIG_SYS_PROMPT) + 16)
|
||||
/* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||
|
||||
/*
|
||||
* Our platforms make use of SPL to initalize the hardware (primarily
|
||||
|
||||
64
include/configs/bur_cfg_common.h
Normal file
64
include/configs/bur_cfg_common.h
Normal file
@ -0,0 +1,64 @@
|
||||
/*
|
||||
* bur_cfg_common.h
|
||||
*
|
||||
* common parts used over all B&R boards
|
||||
*
|
||||
* Copyright (C) 2016 Hannes Schmelzer <oe5hpm@oevsv.at> -
|
||||
* Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#ifndef __BUR_CFG_COMMON_H__
|
||||
#define __BUR_CFG_COMMON_H__
|
||||
/* ------------------------------------------------------------------------- */
|
||||
#define BUR_COMMON_ENV \
|
||||
"usbscript=usb start && fatload usb 0 ${scradr} usbscript.img &&" \
|
||||
" source ${scradr}\0" \
|
||||
"brdefaultip=if test -r ${ipaddr}; then; else" \
|
||||
" setenv ipaddr 192.168.60.1; setenv serverip 192.168.60.254;" \
|
||||
" setenv gatewayip 192.168.60.254; setenv netmask 255.255.255.0; fi;\0" \
|
||||
"netconsole=echo switching to network console ...; " \
|
||||
"if dhcp; then; else run brdefaultip; fi; setenv ncip ${serverip}; " \
|
||||
"setcurs 1 9; lcdputs myip; setcurs 10 9; lcdputs ${ipaddr};" \
|
||||
"setcurs 1 10;lcdputs serverip; setcurs 10 10; lcdputs ${serverip};" \
|
||||
"setenv stdout nc;setenv stdin nc;setenv stderr nc\0"
|
||||
|
||||
#define CONFIG_PREBOOT "run cfgscr; run brdefaultip"
|
||||
|
||||
#define CONFIG_BOARD_LATE_INIT
|
||||
|
||||
/* Network defines */
|
||||
#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */
|
||||
#define CONFIG_BOOTP_SEND_HOSTNAME
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_SUBNETMASK
|
||||
#define CONFIG_NET_RETRY_COUNT 2
|
||||
|
||||
/* Network console */
|
||||
#define CONFIG_NETCONSOLE 1
|
||||
#define CONFIG_BOOTP_MAY_FAIL /* if we don't have DHCP environment */
|
||||
|
||||
#define CONFIG_SYS_CONSOLE_INFO_QUIET
|
||||
#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */
|
||||
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
|
||||
#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
|
||||
|
||||
/* As stated above, the following choices are optional. */
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_AUTO_COMPLETE
|
||||
#define CONFIG_CMDLINE_EDITING
|
||||
#define CONFIG_VERSION_VARIABLE
|
||||
|
||||
/* We set the max number of command args high to avoid HUSH bugs. */
|
||||
#define CONFIG_SYS_MAXARGS 64
|
||||
|
||||
/* Console I/O Buffer Size */
|
||||
#define CONFIG_SYS_CBSIZE 512
|
||||
/* Print Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE +\
|
||||
sizeof(CONFIG_SYS_PROMPT) + 16)
|
||||
/* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||
|
||||
#endif /* __BUR_CFG_COMMON_H__ */
|
||||
@ -12,6 +12,7 @@
|
||||
#ifndef __CONFIG_KWB_H__
|
||||
#define __CONFIG_KWB_H__
|
||||
|
||||
#include <configs/bur_cfg_common.h>
|
||||
#include <configs/bur_am335x_common.h>
|
||||
/* ------------------------------------------------------------------------- */
|
||||
#define CONFIG_AM335X_LCD
|
||||
@ -27,6 +28,9 @@
|
||||
#define CONFIG_BMP_24BMP
|
||||
#define CONFIG_BMP_32BPP
|
||||
|
||||
/* memory */
|
||||
#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024)
|
||||
|
||||
/* Clock Defines */
|
||||
#define V_OSCK 26000000 /* Clock output from T2 */
|
||||
#define V_SCLK (V_OSCK)
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
#ifndef __CONFIG_TSERIES_H__
|
||||
#define __CONFIG_TSERIES_H__
|
||||
|
||||
#include <configs/bur_cfg_common.h>
|
||||
#include <configs/bur_am335x_common.h>
|
||||
/* ------------------------------------------------------------------------- */
|
||||
#define CONFIG_AM335X_LCD
|
||||
@ -30,6 +31,10 @@
|
||||
#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000
|
||||
#define CONFIG_BOOTCOUNT_LIMIT
|
||||
#define CONFIG_BOOTCOUNT_AM33XX
|
||||
|
||||
/* memory */
|
||||
#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024)
|
||||
|
||||
/* Clock Defines */
|
||||
#define V_OSCK 26000000 /* Clock output from T2 */
|
||||
#define V_SCLK (V_OSCK)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user