Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b0e51ebca2dc66e005e61084d08ad17ce611e890

Authored by Wolfgang Denk
2 parents 638a48ed60 be827c7ab0
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx 

* 'master' of git://git.denx.de/u-boot-mpc85xx:
  powerpc/85xx: add support for env in MMC/SPI on corenet ds boards
  powerpc/85xx: Enable eSPI support on corenet ds boards

Showing 3 changed files Side-by-side Diff

board/freescale/common/Makefile
Diff comments   View file @ b0e51eb
... ... @@ -36,7 +36,9 @@
36 36 COBJS-$(CONFIG_PQ_MDS_PIB) += pq-mds-pib.o
37 37 COBJS-$(CONFIG_ID_EEPROM) += sys_eeprom.o
38 38 COBJS-$(CONFIG_FSL_SGMII_RISER) += sgmii_riser.o
  39 +ifndef CONFIG_RAMBOOT_PBL
39 40 COBJS-$(CONFIG_ENV_IS_IN_MMC) += sdhc_boot.o
  41 +endif
40 42  
41 43 COBJS-$(CONFIG_MPC8541CDS) += cds_pci_ft.o
42 44 COBJS-$(CONFIG_MPC8548CDS) += cds_pci_ft.o
... ... @@ -572,9 +572,14 @@
572 572 P2020RDB_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2020RDB,SDCARD
573 573 P2020RDB_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P2020RDB,SPIFLASH
574 574 P3041DS powerpc mpc85xx corenet_ds freescale
  575 +P3041DS_SDCARD powerpc mpc85xx corenet_ds freescale - P3041DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  576 +P3041DS_SPIFLASH powerpc mpc85xx corenet_ds freescale - P3041DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
575 577 P4080DS powerpc mpc85xx corenet_ds freescale
576   -P4080DS_RAMBOOT_PBL powerpc mpc85xx corenet_ds freescale - P4080DS:RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF80000
  578 +P4080DS_SDCARD powerpc mpc85xx corenet_ds freescale - P4080DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  579 +P4080DS_SPIFLASH powerpc mpc85xx corenet_ds freescale - P4080DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
577 580 P5020DS powerpc mpc85xx corenet_ds freescale
  581 +P5020DS_SDCARD powerpc mpc85xx corenet_ds freescale - P5020DS:RAMBOOT_PBL,SDCARD,SYS_TEXT_BASE=0xFFF80000
  582 +P5020DS_SPIFLASH powerpc mpc85xx corenet_ds freescale - P5020DS:RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF80000
578 583 mpq101 powerpc mpc85xx mpq101 mercury - mpq101
579 584 stxgp3 powerpc mpc85xx stxgp3 stx
580 585 stxssa powerpc mpc85xx stxssa stx - stxssa
include/configs/corenet_ds.h
Diff comments   View file @ b0e51eb
... ... @@ -68,17 +68,34 @@
68 68  
69 69 #define CONFIG_ENV_OVERWRITE
70 70  
71   -#if defined(CONFIG_RAMBOOT_PBL)
72   - #define CONFIG_SYS_NO_FLASH /* Store ENV in memory only */
73   -#endif
74   -
75 71 #ifdef CONFIG_SYS_NO_FLASH
76 72 #define CONFIG_ENV_IS_NOWHERE
77 73 #else
78   -#define CONFIG_ENV_IS_IN_FLASH
79 74 #define CONFIG_FLASH_CFI_DRIVER
80 75 #define CONFIG_SYS_FLASH_CFI
  76 +#endif
  77 +
  78 +#if defined(CONFIG_SPIFLASH)
  79 +#define CONFIG_SYS_EXTRA_ENV_RELOC
  80 +#define CONFIG_ENV_IS_IN_SPI_FLASH
  81 +#define CONFIG_ENV_SPI_BUS 0
  82 +#define CONFIG_ENV_SPI_CS 0
  83 +#define CONFIG_ENV_SPI_MAX_HZ 10000000
  84 +#define CONFIG_ENV_SPI_MODE 0
  85 +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */
  86 +#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
  87 +#define CONFIG_ENV_SECT_SIZE 0x10000
  88 +#elif defined(CONFIG_SDCARD)
  89 +#define CONFIG_SYS_EXTRA_ENV_RELOC
  90 +#define CONFIG_ENV_IS_IN_MMC
  91 +#define CONFIG_SYS_MMC_ENV_DEV 0
  92 +#define CONFIG_ENV_SIZE 0x2000
  93 +#define CONFIG_ENV_OFFSET (512 * 1097)
  94 +#else
  95 +#define CONFIG_ENV_IS_IN_FLASH
81 96 #define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
  97 +#define CONFIG_ENV_SIZE 0x2000
  98 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
82 99 #endif
83 100  
84 101 #define CONFIG_SYS_CLK_FREQ get_board_sys_clk() /* sysclk for MPC85xx */
... ... @@ -351,6 +368,16 @@
351 368 #define CONFIG_SYS_SRIO2_MEM_SIZE 0x10000000 /* 256M */
352 369  
353 370 /*
  371 + * eSPI - Enhanced SPI
  372 + */
  373 +#define CONFIG_FSL_ESPI
  374 +#define CONFIG_SPI_FLASH
  375 +#define CONFIG_SPI_FLASH_SPANSION
  376 +#define CONFIG_CMD_SF
  377 +#define CONFIG_SF_DEFAULT_SPEED 10000000
  378 +#define CONFIG_SF_DEFAULT_MODE 0
  379 +
  380 +/*
354 381 * General PCI
355 382 * Memory space is mapped 1-1, but I/O space must start from 0.
356 383 */
... ... @@ -503,9 +530,6 @@
503 530 /*
504 531 * Environment
505 532 */
506   -#define CONFIG_ENV_SIZE 0x2000
507   -#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K (one sector) */
508   -
509 533 #define CONFIG_LOADS_ECHO /* echo on for serial download */
510 534 #define CONFIG_SYS_LOADS_BAUD_CHANGE /* allow baudrate change */
511 535