From 6802d7951c8f5a6098a30ab686e867dc0724affc Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Sun, 7 Jul 2019 20:59:55 +0800 Subject: Add i.MX7D based Meerkat96 board support The Meerkat96 board, based on the NXP i.MX7D SoC, is a member of 96Boards community and complies with all Consumer Edition board specifications. https://www.novtech.com/products/meerkat96.html https://www.96boards.org/product/imx7-96/ The initial supported/tested devices include: - Debug serial - SD - USB Host (with Ethernet) With these support, it's good enough for loading Linux Kernel from SD or Ethernet over USB. Signed-off-by: Shawn Guo Reviewed-by: Peng Fan Tested-by: Manivannan Sadhasivam --- include/configs/meerkat96.h | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 include/configs/meerkat96.h (limited to 'include') diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h new file mode 100644 index 00000000000..d0450af9542 --- /dev/null +++ b/include/configs/meerkat96.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Linaro Ltd. + * Copyright (C) 2016 NXP Semiconductors + * + * Configuration settings for Meerkat96 board. + */ + +#ifndef __MEERKAT96_CONFIG_H +#define __MEERKAT96_CONFIG_H + +#include "mx7_common.h" +#include + +#define PHYS_SDRAM_SIZE SZ_512M + +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M) + +#define CONFIG_SYS_MEMTEST_START 0x80000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x20000000) + +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_HZ 1000 + +/* Physical Memory Map */ +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#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) + +/* Environment configs */ +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_SYS_MMC_ENV_PART 0 +#define CONFIG_ENV_SIZE SZ_8K +#define CONFIG_ENV_OFFSET (8 * SZ_64K) + +/* USB configs */ +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) + +#endif -- cgit v1.2.3 From 6ee03c92121575b8a2d4a2c7f39959fdf32436ef Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Thu, 20 Jun 2019 22:34:35 +0200 Subject: mx6: mx6sabre common: Use more conventional spelling of fdtfile Both the distro boot configuration as well as the general pxe support standardized on fdtfile as the variable to hold the dtb filename. Adjust to follow that such that e.g. "pxe boot" will just work. Signed-off-by: Sjoerd Simons --- include/configs/mx6sabre_common.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index d704cda2a6c..56b10d8eb29 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -51,7 +51,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ "image=zImage\0" \ - "fdt_file=undefined\0" \ + "fdtfile=undefined\0" \ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -87,7 +87,7 @@ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run finduuid; " \ "run mmcargs; " \ @@ -116,7 +116,7 @@ "fi; " \ "${get_cmd} ${image}; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ "bootz ${loadaddr} - ${fdt_addr}; " \ "else " \ "if test ${boot_fdt} = try; then " \ @@ -129,20 +129,20 @@ "bootz; " \ "fi;\0" \ "findfdt="\ - "if test $fdt_file = undefined; then " \ + "if test $fdtfile = undefined; then " \ "if test $board_name = SABREAUTO && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6qp-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6q-sabreauto.dtb; fi; " \ "if test $board_name = SABREAUTO && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabreauto.dtb; fi; " \ + "setenv fdtfile imx6dl-sabreauto.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6QP; then " \ - "setenv fdt_file imx6qp-sabresd.dtb; fi; " \ + "setenv fdtfile imx6qp-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6Q; then " \ - "setenv fdt_file imx6q-sabresd.dtb; fi; " \ + "setenv fdtfile imx6q-sabresd.dtb; fi; " \ "if test $board_name = SABRESD && test $board_rev = MX6DL; then " \ - "setenv fdt_file imx6dl-sabresd.dtb; fi; " \ - "if test $fdt_file = undefined; then " \ + "setenv fdtfile imx6dl-sabresd.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine dtb to use; fi; " \ "fi;\0" \ -- cgit v1.2.3 From 954252aa350931ebf6b114cd0f59a05ab03f6bbf Mon Sep 17 00:00:00 2001 From: Soeren Moch Date: Fri, 11 Oct 2019 00:59:50 +0200 Subject: board: tbs2910: Convert eth to driver model So we can remove lots of legacy config code. Signed-off-by: Soeren Moch --- include/configs/tbs2910.h | 9 --------- 1 file changed, 9 deletions(-) (limited to 'include') diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 11f76e777bb..46d67a7fcfd 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -40,15 +40,6 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ -/* Ethernet */ -#define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 4 -#define CONFIG_PHY_ATHEROS - /* Framebuffer */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_BMP_RLE8 -- cgit v1.2.3 From 7cc7c1e9db61ecf02e6f9b7d3d27171aaf1719fe Mon Sep 17 00:00:00 2001 From: Jun Nie Date: Tue, 16 Jul 2019 15:42:57 +0800 Subject: pico-imx7d: Support distro boot for FIT image case Support distro boot for pico imx7d in FIT image case. Signed-off-by: Jun Nie Tested-by: Joris Offouga --- include/configs/pico-imx7d.h | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) (limited to 'include') diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h index 5c4b90a8a1e..607784e4236 100644 --- a/include/configs/pico-imx7d.h +++ b/include/configs/pico-imx7d.h @@ -55,17 +55,17 @@ /* When booting with FIT specify the node entry containing boot.scr */ #if defined(CONFIG_FIT) #define PICO_BOOT_ENV \ - "bootscr_fitimage_name=bootscr\0" \ - "bootscriptaddr=0x83200000\0" \ - "fdtovaddr=0x83100000\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "rootwait rw;\0" \ - "loadbootscript=" \ - "load mmc ${mmcdev}:${mmcpart} ${bootscriptaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source ${bootscriptaddr}:${bootscr_fitimage_name}\0" + BOOTENV \ + "fdtovaddr=0x83100000\0" \ + "scriptaddr=0x83200000\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "rootwait rw\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "iminfo ${scriptaddr};" \ + "if test $? -eq 1; then hab_failsafe; fi;" \ + "source ${scriptaddr}:bootscr\0" #else #define PICO_BOOT_ENV \ "bootmenu_0=Boot using PICO-Hobbit baseboard=" \ @@ -112,21 +112,6 @@ "setup_emmc=mmc dev 0; gpt write mmc 0 $partitions; reset;\0" \ PICO_BOOT_ENV -#if defined(CONFIG_FIT) -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run loadbootscript; then " \ - "iminfo ${bootscriptaddr};" \ - "if test $? -eq 1; then hab_failsafe; fi;" \ - "run bootscript; " \ - "else " \ - "echo Fail to load fitImage with boot script;" \ - "hab_failsafe;" \ - "fi; " \ - "fi" -#endif - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(USB, usb, 0) \ -- cgit v1.2.3 From a142e601f89ed6ca91e5a960618939dbb04f4a87 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 10 Oct 2019 16:11:22 +0200 Subject: imx: tpc70: config: Add script commands to update u-boot and OE's wic Signed-off-by: Lukasz Majewski --- include/configs/kp_imx6q_tpc.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'include') diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index c160ad5bf6b..d20fc7eb10f 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -81,11 +81,32 @@ "rdinit=/sbin/init\0" \ "addinitrd=setenv bootargs ${bootargs} rdinit=${rdinit} ${debug} \0" \ "fit_config=mx6q_tpc70_conf\0" \ + "uboot_file=u-boot.img\0" \ + "SPL_file=SPL\0" \ + "wic_file=kp-image-kpimx6qtpc.wic\0" \ "upd_image=st.4k\0" \ "updargs=setenv bootargs console=${console} ${smp}"\ "rdinit=${rdinit} ${debug} ${displayargs}\0" \ "loadusb=usb start; " \ "fatload usb 0 ${loadaddr} ${upd_image}\0" \ + "upd_uboot_sd=" \ + "if tftp ${loadaddr} ${uboot_file}; then " \ + "setexpr blkc ${filesize} / 0x200;" \ + "setexpr blkc ${blkc} + 1;" \ + "mmc write ${loadaddr} 0x8A ${blkc};" \ + "fi;\0" \ + "upd_SPL_sd=" \ + "if tftp ${loadaddr} ${SPL_file}; then " \ + "setexpr blkc ${filesize} / 0x200;" \ + "setexpr blkc ${blkc} + 1;" \ + "mmc write ${loadaddr} 0x2 ${blkc};" \ + "fi;\0" \ + "upd_wic=" \ + "if tftp ${loadaddr} ${wic_file}; then " \ + "setexpr blkc ${filesize} / 0x200;" \ + "setexpr blkc ${blkc} + 1;" \ + "mmc write ${loadaddr} 0x0 ${blkc};" \ + "fi;\0" \ "usbupd=echo Booting update from usb ...; " \ "setenv bootargs; " \ "run updargs; " \ -- cgit v1.2.3 From 309ce98fcbc186789f11794af491f8e6c9627443 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 10 Oct 2019 16:11:23 +0200 Subject: imx: tpc70: config: Update TPC70 config to support eMMC's boot0 SPL update The TPC70 can boot from eMMC's boot0. This patch allows it to update this HW partition's SPL. Signed-off-by: Lukasz Majewski --- include/configs/kp_imx6q_tpc.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index d20fc7eb10f..28b4b55e6a8 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -42,6 +42,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 1 /* 0 = SDHC2, 1 = SDHC4 (eMMC) */ +#define CONFIG_SUPPORT_EMMC_BOOT /* UART */ #define CONFIG_MXC_UART @@ -101,6 +102,10 @@ "setexpr blkc ${blkc} + 1;" \ "mmc write ${loadaddr} 0x2 ${blkc};" \ "fi;\0" \ + "upd_SPL_mmc=mmc dev 1; mmc partconf 1 0 1 1; run upd_SPL_sd\0" \ + "upd_uboot_mmc=mmc dev 1; mmc partconf 1 0 1 1; run upd_uboot_sd\0" \ + "up_mmc=run upd_SPL_mmc; run upd_uboot_mmc\0" \ + "up_sd=run upd_SPL_sd; run upd_uboot_sd\0" \ "upd_wic=" \ "if tftp ${loadaddr} ${wic_file}; then " \ "setexpr blkc ${filesize} / 0x200;" \ -- cgit v1.2.3 From 0bcb11fa1f04baeb0d5462a358aa86b16062bebd Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 10 Oct 2019 16:11:29 +0200 Subject: imx: tpc70: Convert TPC70 (imx6q) board to use DM/DTS in SPL and u-boot This patch converts the TPC70 to use driver model and device tree description in both SPL and u-boot proper. Notable changes (DM/DTS conversion): - PINCTRL{_IMX6} - DM_I2C - enable 'regulator' and 'pmic' commands - DM_MMC and BLK (USDHC) - DM_ETH - DM WDT (including SYSRESET) Signed-off-by: Lukasz Majewski --- include/configs/kp_imx6q_tpc.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'include') diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 28b4b55e6a8..08cf90280ee 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -25,30 +25,9 @@ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M) /* FEC ethernet */ -#define IMX_FEC_BASE ENET_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RGMII -#define CONFIG_ETHPRIME "FEC" -#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_ARP_TIMEOUT 200UL -/* I2C Configs */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MXC -#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ -#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ -#define CONFIG_SYS_I2C_SPEED 100000 - -/* MMC Configs */ -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 1 /* 0 = SDHC2, 1 = SDHC4 (eMMC) */ -#define CONFIG_SUPPORT_EMMC_BOOT - -/* UART */ -#define CONFIG_MXC_UART -#define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_CONS_INDEX 1 -#define CONFIG_BAUDRATE 115200 /* USB Configs */ #ifdef CONFIG_CMD_USB -- cgit v1.2.3 From 5e9387130566219ab70170f9c6d98966be5a960a Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Thu, 10 Oct 2019 16:11:30 +0200 Subject: imx: config: Update KP's TPC70 config to support SWUpdate This patch updates envs responsible for using USB pendrive as a SWUpdate based tool for recovery and update. Signed-off-by: Lukasz Majewski --- include/configs/kp_imx6q_tpc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 08cf90280ee..f6746a93ca2 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -65,8 +65,9 @@ "SPL_file=SPL\0" \ "wic_file=kp-image-kpimx6qtpc.wic\0" \ "upd_image=st.4k\0" \ - "updargs=setenv bootargs console=${console} ${smp}"\ - "rdinit=${rdinit} ${debug} ${displayargs}\0" \ + "updargs=setenv bootargs console=${console} ${smp} ${displayargs}\0" \ + "initrd_ram_dev=/dev/ram\0" \ + "addswupdate=setenv bootargs ${bootargs} root=${initrd_ram_dev} rw\0" \ "loadusb=usb start; " \ "fatload usb 0 ${loadaddr} ${upd_image}\0" \ "upd_uboot_sd=" \ @@ -94,6 +95,8 @@ "usbupd=echo Booting update from usb ...; " \ "setenv bootargs; " \ "run updargs; " \ + "run addinitrd; " \ + "run addswupdate; " \ "run loadusb; " \ "bootm ${loadaddr}#${fit_config}\0" \ BOOTENV -- cgit v1.2.3 From f9f42b07ff7b986699977c3e3c1eebe8a0535a72 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 12 Jul 2019 09:33:55 +0000 Subject: imx8qm/qxp: Set SPL TEXT base to OCRAM base Modify the SPL TEXT base from OCRAM alias to OCRAM base 0x100000, so we can use full OCRAM not limit to 96KB Signed-off-by: Ye Li Reviewed-by: Oleksandr Suvorov --- include/configs/imx8qm_mek.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 869035172e3..2b8f85ded11 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -10,7 +10,6 @@ #include #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_TEXT_BASE 0x0 #define CONFIG_SPL_MAX_SIZE (124 * 1024) #define CONFIG_SYS_MONITOR_LEN (1024 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR -- cgit v1.2.3 From 5f1e987c8bef414b24c08ddb3adc135c440349c6 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Fri, 11 Oct 2019 12:57:06 +0300 Subject: apalis_imx6: remove legacy sdboot wrapper Remove legacy sdboot wrapper as distroboot can be used instead. Signed-off-by: Igor Opaniuk --- include/configs/apalis_imx6.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'include') diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 5139b01ab3a..a5f9a96732f 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -158,24 +158,6 @@ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro,noatime " \ - "rootfstype=ext4 rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card; " \ - "run sddtbload; load mmc ${sddev}:${sdbootpart} " \ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "sdbootpart=1\0" \ - "sddev=1\0" \ - "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ - "${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - " \ - "${fdt_addr_r}\" && true\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - #ifndef CONFIG_TDX_APALIS_IMX6_V1_0 #define FDT_FILE "imx6q-apalis-eval.dtb" #define FDT_FILE_V1_0 "imx6q-apalis_v1_0-eval.dtb" @@ -196,7 +178,6 @@ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ - SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \ -- cgit v1.2.3 From 3bae9bb2863df21a63e4be6196d13c4f2e89482d Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Fri, 11 Oct 2019 12:57:07 +0300 Subject: colibri-imx6ull: remove legacy sdboot wrapper Remove legacy sdboot wrapper as distroboot can be used instead. Signed-off-by: Igor Opaniuk --- include/configs/colibri-imx6ull.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'include') diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 0a4f30fbaf4..de94eb95fe9 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -56,19 +56,6 @@ "tftp ${fdt_addr_r} " FDT_FILE " && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \ - "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " FDT_FILE " && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "sdbootpart=1\0" \ - "sddev=0\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - #define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rw rootfstype=ubifs " \ "ubi.fm_autoconvert=1\0" \ @@ -95,7 +82,6 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ - SD_BOOTCMD \ UBI_BOOTCMD \ "console=ttymxc0\0" \ "defargs=user_debug=30\0" \ -- cgit v1.2.3 From 541bfadc70479a8e585a2fc1834b568d7ce527a0 Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Fri, 11 Oct 2019 12:57:08 +0300 Subject: colibri_imx6: remove legacy sdboot wrapper Remove legacy sdboot wrapper as distroboot can be used instead. Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx6.h | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'include') diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 69bf8225fe5..1f2b89e7225 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -148,23 +148,6 @@ "nfsdtbload=setenv dtbparam; tftp ${fdt_addr_r} ${fdt_file} " \ "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} rw,noatime " \ - "rootfstype=ext4 rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card; " \ - "run sddtbload; load mmc ${sddev}:${sdbootpart} "\ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "sdbootpart=1\0" \ - "sddev=1\0" \ - "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ - "${fdt_addr_r} ${fdt_file} && setenv dtbparam \" - " \ - "${fdt_addr_r}\" && true\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -180,7 +163,6 @@ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ - SD_BOOTCMD \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; tftpboot ${loadaddr} " \ "flash_eth.img && source ${loadaddr}\0" \ -- cgit v1.2.3 From e2c3c2e32c51d9bab98123782d561b204b6e163d Mon Sep 17 00:00:00 2001 From: Igor Opaniuk Date: Fri, 11 Oct 2019 12:57:09 +0300 Subject: colibri_imx7: remove legacy sdboot wrapper Remove legacy sdboot wrapper as distroboot can be used instead. Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx7.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'include') diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index ade4df5ad8a..c2d98291b0c 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -109,28 +109,6 @@ "ramdisk_addr_r=0x82100000\0" \ "scriptaddr=0x82500000\0" -#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND) -#define SD_BOOTDEV 0 -#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) -#define SD_BOOTDEV 1 -#endif - -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "run m4boot && " \ - "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \ - "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \ - "${soc}-colibri-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "sdbootpart=1\0" \ - "sddev=" __stringify(SD_BOOTDEV) "\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - - #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ "nfsboot=run setup; " \ @@ -184,7 +162,6 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ - SD_BOOTCMD \ MODULE_EXTRA_ENV_SETTINGS \ "boot_file=zImage\0" \ "console=ttymxc0\0" \ -- cgit v1.2.3 From d02be21d3004b51c6fc9a54b90d31dcc2dac4a9a Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Wed, 24 Jul 2019 08:54:16 +0000 Subject: i2c: imx_lpi2c: add ipg clk The controller needs two clk, per clk and ipg clk, so let's add ipg clk. Signed-off-by: Peng Fan --- include/imx_lpi2c.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/imx_lpi2c.h b/include/imx_lpi2c.h index 2700e5f8763..3ce9edaf101 100644 --- a/include/imx_lpi2c.h +++ b/include/imx_lpi2c.h @@ -18,6 +18,7 @@ struct imx_lpi2c_bus { struct i2c_pads_info *pads_info; struct udevice *bus; struct clk per_clk; + struct clk ipg_clk; }; struct imx_lpi2c_reg { -- cgit v1.2.3