Commit 78c7ecd8 authored by Thomas Schäfer's avatar Thomas Schäfer
Browse files

pitx-imx8m: move config settings to _defconfig



- move config settings from include/configs/pitx-imx8m.h to
  pitx-imx8m_defconfig.
- add device support for different SPI flash vendors: Winbond,
  EON, Gigadevice, ISSI, STMICRO.
- format line length of EXTRA_ENVIRONMENT_SETTINGS to below 80
  characters.
Signed-off-by: Thomas Schäfer's avatarThomas Schaefer <thomas.schaefer@kontron.com>
parent de868045
......@@ -10,21 +10,32 @@ CONFIG_FIT=y
CONFIG_FIT_EXTERNAL_OFFSET=0x3000
CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
CONFIG_OF_BOARD_SETUP=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg"
CONFIG_ARCH_MISC_INIT=y
CONFIG_SPL_BOARD_INIT=y
CONFIG_SPL_USB_HOST_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_LICENSE=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_BOOTEFI is not set
CONFIG_CRC32_VERIFY=y
CONFIG_CMD_MD5SUM=y
CONFIG_MD5SUM_VERIFY=y
CONFIG_CMD_MEMTEST=y
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_PMIC=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y
......@@ -46,8 +57,14 @@ CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_MODE=0x0
CONFIG_SF_DEFAULT_SPEED=20000000
# CONFIG_SPI_FLASH_BAR is not set
CONFIG_SPI_FLASH_EON=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_ISSI=y
CONFIG_SPI_FLASH_MACRONIX=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX8M=y
CONFIG_DM_PMIC=y
......
......@@ -71,11 +71,11 @@
#define CONFIG_SPL_LIBGENERIC_SUPPORT
#define CONFIG_SPL_GPIO_SUPPORT
#define CONFIG_SPL_MMC_SUPPORT
#define CONFIG_SPL_BSS_START_ADDR 0x00180000
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */
#define CONFIG_SYS_SPL_MALLOC_START 0x42200000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#define CONFIG_SPL_BSS_START_ADDR 0x00180000
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */
#define CONFIG_SYS_SPL_MALLOC_START 0x42200000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */
#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000
#define CONFIG_SYS_ICACHE_OFF
#define CONFIG_SYS_DCACHE_OFF
......@@ -106,28 +106,16 @@
#define CONFIG_BOARD_POSTCLK_INIT
#define CONFIG_BOARD_LATE_INIT
/* Flat Device Tree Definitions */
#define CONFIG_OF_BOARD_SETUP
#undef CONFIG_CMD_EXPORTENV
#undef CONFIG_CMD_IMPORTENV
#undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_CRC32
#undef CONFIG_BOOTM_NETBSD
/* ENET Config */
/* ENET1 */
#if defined(CONFIG_CMD_NET)
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_MII
#define CONFIG_MII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_FEC_MXC_PHYADDR 0
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_FEC_MXC_PHYADDR 0
#define FEC_QUIRK_ENET_MAC
#define CONFIG_PHY_GIGE
......@@ -142,48 +130,52 @@
* in clk-imx8mq.c, then clk_ingore_unused could be removed.
*/
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
"autoload=no\0" \
"image=Image\0" \
"splashpos=m,m\0" \
"console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000\0" \
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"autoload=no\0" \
"image=Image\0" \
"splashpos=m,m\0" \
"console=ttymxc2,115200 earlycon=ec_imx6q,0x30880000\0" \
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
"set_fdtfile=setenv fdtfile pitx-imx8m_hdmi.dtb;" "\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"bootfailed=echo Booting failed from all boot sources && false" "\0" \
"set_fdtfile=setenv fdtfile pitx-imx8m_hdmi.dtb;" "\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"bootfailed=echo Booting failed from all boot sources && false\0" \
"bootos=run setbootargs && " \
"run loadimage && " \
"run loadfdt && " \
"booti ${loadaddr} - ${fdt_addr} || false" "\0" \
"loadimage=load ${intf} ${bdev}:${bpart} ${loadaddr} ${image}" "\0" \
"loadfdt=run set_fdtfile && load ${intf} ${bdev}:${bpart} ${fdt_addr} ${fdtfile}" "\0" \
"setbootargs=setenv bootargs console=${console},${baudrate} root=${rootpath}" "\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw" "\0" \
"booti ${loadaddr} - ${fdt_addr} || false\0" \
"loadimage=load ${intf} ${bdev}:${bpart} ${loadaddr} ${image}\0" \
"loadfdt=run set_fdtfile && " \
"load ${intf} ${bdev}:${bpart} ${fdt_addr} ${fdtfile}\0" \
"setbootargs=setenv bootargs console=${console},${baudrate} " \
"root=${rootpath}\0" \
"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
"mmcboot=echo Booting from mmc ... && " \
"setenv bdev 0 && setenv bpart 1 && setenv intf mmc && " \
"mmc dev ${bdev} && setenv rootpath ${mmcroot} && " \
"run bootos" "\0" \
"usbroot=/dev/sda1 rootwait rw" "\0" \
"run bootos\0" \
"usbroot=/dev/sda1 rootwait rw\0" \
"usbboot=echo Booting from USB ... && " \
"setenv bdev 0 && setenv bpart 1 && setenv intf usb && " \
"usb start && usb dev ${bdev} && setenv rootpath ${usbroot} && " \
"run bootos" "\0" \
"netsetbootargs=bootp && setenv bootargs console=${console},${baudrate} root=/dev/nfs ip=dhcp " \
"nfsroot=${serverip}:${nfsrootpath},v3,tcp" "\0" \
"nfsrootpath=/srv/export/pitx-imx8m" "\0" \
"usb start && usb dev ${bdev} && setenv rootpath ${usbroot} && "\
"run bootos\0" \
"netsetbootargs=bootp && " \
"setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs ip=dhcp " \
"nfsroot=${serverip}:${nfsrootpath},v3,tcp\0" \
"nfsrootpath=/srv/export/pitx-imx8m\0" \
"netboot=echo Booting from net ...; " \
"run netsetbootargs && " \
"tftp ${loadaddr} ${image} && " \
"run set_fdtfile && tftp ${fdt_addr} ${fdtfile} && " \
"booti ${loadaddr} - ${fdt_addr} || false" "\0" \
"sdroot=/dev/mmcblk1p2 rootwait rw" "\0" \
"booti ${loadaddr} - ${fdt_addr} || false\0" \
"sdroot=/dev/mmcblk1p2 rootwait rw\0" \
"sdboot=echo Booting from SD card ... && " \
"setenv bdev 1 && setenv bpart 1 && setenv intf mmc && " \
"mmc dev ${bdev} && setenv rootpath ${sdroot} && " \
"run bootos" "\0"
"run bootos\0"
#define CONFIG_BOOTCOMMAND \
......@@ -192,25 +184,25 @@
/* Link Definitions */
#define CONFIG_LOADADDR 0x40480000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE 0x80000
#define CONFIG_SYS_INIT_SP_OFFSET \
(CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
#define CONFIG_ENV_OVERWRITE
#define CONFIG_ENV_OFFSET (64 * SZ_64K)
#define CONFIG_ENV_OFFSET (64 * SZ_64K)
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */
#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */
#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN ((CONFIG_ENV_SIZE + (2*1024) + (16*1024)) * 1024)
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM 0x40000000
#define PHYS_SDRAM_SIZE 0xC0000000 /* 3GB DDR in DRAM1 region */
#define PHYS_SDRAM_2 0x100000000UL
#define PHYS_SDRAM_2_SIZE 0x40000000 /* 1GB DDR in DRAM2 region */
......@@ -225,16 +217,15 @@
#define CONFIG_MXC_UART_BASE UART3_BASE_ADDR
/* Monitor Command Prompt */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_CBSIZE 2048
#define CONFIG_SYS_MAXARGS 64
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
sizeof(CONFIG_SYS_PROMPT) + 16)
#define CONFIG_IMX_BOOTAUX
#define CONFIG_CMD_MMC
#define CONFIG_FSL_ESDHC
#define CONFIG_FSL_USDHC
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment