Re: [U-Boot] [PATCH v6] ARM: am335x: Add phyCORE AM335x R2 support

On 5/8/19 1:22 PM, Niel Fourie wrote:

[...]

diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h new file mode 100644 index 0000000000..31a07062a0 --- /dev/null +++ b/include/configs/phycore_am335x_r2.h @@ -0,0 +1,130 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*

• • phycore_am335x_r2.h
• • Phytec phyCORE-AM335x R2 (pcl060) boards information header
• • Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
• • Copyright (C) 2013 Lars Poeschel, Lemonage Software GmbH
• • Copyright (C) 2019 DENX Software Engineering GmbH
• */

+#ifndef __CONFIG_PHYCORE_AM335x_R2_H +#define __CONFIG_PHYCORE_AM335x_R2_H

+#include <configs/ti_am335x_common.h>

+#define CONFIG_ENV_SIZE SZ_128K +#define CONFIG_MACH_TYPE MACH_TYPE_SBC_PHYCORE_AM335X +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1

+#ifdef CONFIG_NAND +#define NANDARGS \

• "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
• "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
• "nandargs=setenv bootargs console=${console} " \

• "${optargs} " \
  

• "root=${nandroot} " \
  

• "rootfstype=${nandrootfstype}\0" \
  

• "nandroot=ubi0:root ubi.mtd=NAND.UBI\0" \
• "nandrootfstype=ubifs rootwait rw fsck.repair=yes\0" \
• "nandboot=echo Booting from nand ...; " \

• "run nandargs; " \
  

• "ubi part NAND.UBI; " \
  

• "ubi readvol ${fdtaddr} oftree; " \
  

• "ubi readvol ${loadaddr} kernel; " \
  

• "bootz ${loadaddr} - ${fdtaddr}\0"
  

+#else +#define NANDARGS "" +#endif

+/* set to negative value for no autoboot */ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \

• "bootcmd_" #devtypel #instance "=" \
• "setenv mmcdev " #instance "; "\
• "setenv bootpart " #instance ":1 ; "\
• "setenv rootpart " #instance ":2 ; "\
• "run mmcboot\0"

+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \

• #devtypel #instance " "

+#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \

• "bootcmd_" #devtypel #instance "=" \
• "run nandboot\0"

+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \

• #devtypel #instance " "

+#define BOOT_TARGET_DEVICES(func) \

• func(MMC, mmc, 0) \
• func(LEGACY_MMC, legacy_mmc, 0) \
• func(MMC, mmc, 1) \
• func(LEGACY_MMC, legacy_mmc, 1) \
• func(NAND, nand, 0)

+#include <config_distro_bootcmd.h> +#include <environment/ti/dfu.h> +#include <environment/ti/mmc.h>

+#define CONFIG_EXTRA_ENV_SETTINGS \

• DEFAULT_MMC_TI_ARGS \
• DEFAULT_LINUX_BOOT_ENV \
• "bootfile=zImage\0" \
• "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
• "console=ttyO0,115200n8\0" \

console=ttyS0,115200

ttyO0 is deprecated