paul@44Server:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm_k3r5-oe-linux-gnueabi/u-boot-ti-staging/1_2023.04+gitAUTOINC+24098ea90d-r0.psdk3/git$ git status On branch ti-u-boot-2023.04 Your branch is behind 'origin/ti-u-boot-2023.04' by 382 commits, and can be fast-forwarded. (use "git pull" to update your local branch) Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: arch/arm/dts/k3-am62-main.dtsi modified: arch/arm/dts/k3-am625-sk.dts modified: arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi modified: configs/am62x_evm_a53_defconfig modified: drivers/mmc/mmc.c modified: include/configs/am62x_evm.h no changes added to commit (use "git add" and/or "git commit -a") paul@44Server:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm_k3r5-oe-linux-gnueabi/u-boot-ti-staging/1_2023.04+gitAUTOINC+24098ea90d-r0.psdk3/git$ grep -rn CONFIG_SPL_VIDEO drivers/Makefile:65:obj-$(CONFIG_SPL_VIDEO) +=video/ drivers/pci/pci_rom.c:375: if (IS_ENABLED(CONFIG_SPL_VIDEO) && spl_phase() > PHASE_SPL && configs/am62x_evm_a53_defconfig:191:CONFIG_SPL_VIDEO_TIDSS=n configs/am62x_evm_a53_defconfig:195:CONFIG_SPL_VIDEO=n configs/am62x_evm_a53_defconfig:200:CONFIG_SPL_VIDEO_BMP_GZIP=n .pc/0314_42_uboot_add_quiet.patch/configs/am62x_evm_a53_defconfig:189:CONFIG_SPL_VIDEO_TIDSS=y .pc/0314_42_uboot_add_quiet.patch/configs/am62x_evm_a53_defconfig:193:CONFIG_SPL_VIDEO=y .pc/0314_42_uboot_add_quiet.patch/configs/am62x_evm_a53_defconfig:198:CONFIG_SPL_VIDEO_BMP_GZIP=y common/board_f.c:414: if (IS_ENABLED(CONFIG_SPL_VIDEO) && spl_phase() > PHASE_SPL && common/spl/spl.c:894:#if defined(CONFIG_SPL_VIDEO_REMOVE) paul@44Server:~/300G_HDD/ti_am62x/build/arago-tmp-default-glibc/work/am62xx_evm_k3r5-oe-linux-gnueabi/u-boot-ti-staging/1_2023.04+gitAUTOINC+24098ea90d-r0.psdk3/git$ git diff diff --git a/arch/arm/dts/k3-am62-main.dtsi b/arch/arm/dts/k3-am62-main.dtsi index bdfda77586e..839d342b894 100644 --- a/arch/arm/dts/k3-am62-main.dtsi +++ b/arch/arm/dts/k3-am62-main.dtsi @@ -535,7 +535,7 @@ ti,itap-del-sel-sdr12 = <0xA>; ti,itap-del-sel-sdr25 = <0x1>; ti,clkbuf-sel = <0x7>; - bus-width = <4>; + bus-width = <1>; status = "disabled"; }; diff --git a/arch/arm/dts/k3-am625-sk.dts b/arch/arm/dts/k3-am625-sk.dts index 859f038c376..9d8063efbe2 100644 --- a/arch/arm/dts/k3-am625-sk.dts +++ b/arch/arm/dts/k3-am625-sk.dts @@ -141,7 +141,7 @@ regulator-boot-on; enable-active-high; vin-supply = <&vcc_3v3_sys>; - gpio = <&exp1 3 GPIO_ACTIVE_HIGH>; + //gpio = <&exp1 3 GPIO_ACTIVE_HIGH>; }; vdd_sd_dv: regulator-4 { @@ -231,12 +231,12 @@ >; }; - main_i2c2_pins_default: main-i2c2-pins-default { - pinctrl-single,pins = < - AM62X_IOPAD(0x0b0, PIN_INPUT_PULLUP, 1) /* (K22) GPMC0_CSn2.I2C2_SCL */ - AM62X_IOPAD(0x0b4, PIN_INPUT_PULLUP, 1) /* (K24) GPMC0_CSn3.I2C2_SDA */ - >; - }; + //main_i2c2_pins_default: main-i2c2-pins-default { + // pinctrl-single,pins = < + // AM62X_IOPAD(0x0b0, PIN_INPUT_PULLUP, 1) /* (K22) GPMC0_CSn2.I2C2_SCL */ + // AM62X_IOPAD(0x0b4, PIN_INPUT_PULLUP, 1) /* (K24) GPMC0_CSn3.I2C2_SDA */ + // >; + //}; main_mmc0_pins_default: main-mmc0-pins-default { pinctrl-single,pins = < @@ -407,8 +407,8 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&main_i2c1_pins_default>; - clock-frequency = <400000>; - + clock-frequency = <100000>; + /* exp1: gpio@22 { compatible = "ti,tca6424"; reg = <0x22>; @@ -435,6 +435,7 @@ pinctrl-names = "default"; pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>; }; + */ }; @@ -455,6 +456,7 @@ pinctrl-0 = <&main_mmc1_pins_default>; ti,driver-strength-ohm = <50>; disable-wp; + sdhci-caps-mask = <0x00000007 0x00000000>; /* Limiting to SD SH speed mode */ }; &cpsw3g { diff --git a/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi b/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi index a408fd702a4..c35262023b8 100644 --- a/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi +++ b/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi @@ -6,7 +6,8 @@ / { chosen { - stdout-path = "serial2:115200n8"; + stdout-path = "serial2:115200n8"; + bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000 quiet"; tick-timer = &timer1; }; @@ -224,9 +225,9 @@ bootph-pre-ram; }; -&exp1 { - bootph-pre-ram; -}; +//&exp1 { +// bootph-pre-ram; +//}; &vdd_mmc1 { bootph-pre-ram; diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig index cc91adf496c..b2d2be27c1e 100644 --- a/configs/am62x_evm_a53_defconfig +++ b/configs/am62x_evm_a53_defconfig @@ -32,6 +32,8 @@ CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000 CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="run envboot; run distro_bootcmd;" +CONFIG_BOOTDELAY=0 +CONFIG_AUTOBOOT=y CONFIG_BOARD_LATE_INIT=y CONFIG_BLOBLIST=y CONFIG_BLOBLIST_ADDR=0x80D00000 @@ -182,23 +184,23 @@ CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x6165 CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_VIDEO=y -# CONFIG_VIDEO_LOGO is not set -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_VIDEO_TIDSS=y -CONFIG_SPL_VIDEO_TIDSS=y -CONFIG_VIDEO_BMP_GZIP=y -CONFIG_BMP_24BPP=y -CONFIG_BMP_32BPP=y -CONFIG_SPL_VIDEO=y -CONFIG_SPL_SPLASH_SCREEN=y -CONFIG_SPL_SYS_WHITE_ON_BLACK=y -CONFIG_SPL_SPLASH_SCREEN_ALIGN=y -CONFIG_SPL_SPLASH_SOURCE=y -CONFIG_SPL_VIDEO_BMP_GZIP=y -CONFIG_SPL_BMP_24BPP=y -CONFIG_SPL_BMP_32BPP=y -CONFIG_SPL_HIDE_LOGO_VERSION=y +CONFIG_VIDEO=n +CONFIG_VIDEO_LOGO=n +CONFIG_SYS_WHITE_ON_BLACK=n + CONFIG_VIDEO_TIDSS=n +CONFIG_SPL_VIDEO_TIDSS=n +CONFIG_VIDEO_BMP_GZIP=n +CONFIG_BMP_24BPP=n +CONFIG_BMP_32BPP=n +CONFIG_SPL_VIDEO=n +CONFIG_SPL_SPLASH_SCREEN=n +CONFIG_SPL_SYS_WHITE_ON_BLACK=n +CONFIG_SPL_SPLASH_SCREEN_ALIGN=n +CONFIG_SPL_SPLASH_SOURCE=n +CONFIG_SPL_VIDEO_BMP_GZIP=n +CONFIG_SPL_BMP_24BPP=n +CONFIG_SPL_BMP_32BPP=n +CONFIG_SPL_HIDE_LOGO_VERSION=n CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 -CONFIG_SPL_GZIP=y -CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SPL_GZIP=n +CONFIG_OF_LIBFDT_OVERLAY=n diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index dde251c87bc..d382f6a443f 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2797,7 +2797,7 @@ static int mmc_power_cycle(struct mmc *mmc) * SD spec recommends at least 1ms of delay. Let's wait for 2ms * to be on the safer side. */ - udelay(2000); + udelay(4000); return mmc_power_on(mmc); } diff --git a/include/configs/am62x_evm.h b/include/configs/am62x_evm.h index bdf0bec0981..c7aeeb3e89c 100644 --- a/include/configs/am62x_evm.h +++ b/include/configs/am62x_evm.h @@ -33,4 +33,7 @@ #define CFG_SYS_NAND_ECCBYTES 14 /*-- end NAND config --*/ +#define CONFIG_BOOTDELAY 0 +#define CONFIG_AUTOBOOT + #endif /* __CONFIG_AM625_EVM_H */ (END)