Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8370978318337df3979aa0852529d53d77ed736e

Authored by Alex Waterman
Committed by Scott Wood
1 parent 91081e01b1
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

Decreases code size of the nand_spl 

The canyonland boards nand_spl size is just under the maximum 4KByte size. This
patch decreases the size of the nand_spl to make a previous commit - commit
65a9db7be0868be91ba81b9b5bf821de82e6d9b0 - fit in the nand_spl.

Signed-off-by: Alex Waterman <awaterman@dawning.com>
Acked-by: Stefan Roese <sr@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>

Showing 1 changed file with 10 additions and 8 deletions Side-by-side Diff

nand_spl/nand_boot.c
Diff comments   View file @ 8370978
... ... @@ -77,6 +77,8 @@
77 77 {
78 78 struct nand_chip *this = mtd->priv;
79 79 int page_addr = page + block * CONFIG_SYS_NAND_PAGE_COUNT;
  80 + void (*hwctrl)(struct mtd_info *mtd, int cmd,
  81 + unsigned int ctrl) = this->cmd_ctrl;
80 82  
81 83 if (this->dev_ready)
82 84 while (!this->dev_ready(mtd))
83 85  
84 86  
85 87  
86 88  
87 89  
88 90  
... ... @@ -95,25 +97,25 @@
95 97 offs >>= 1;
96 98  
97 99 /* Begin command latch cycle */
98   - this->cmd_ctrl(mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
  100 + hwctrl(mtd, cmd, NAND_CTRL_CLE | NAND_CTRL_CHANGE);
99 101 /* Set ALE and clear CLE to start address cycle */
100 102 /* Column address */
101   - this->cmd_ctrl(mtd, offs & 0xff,
  103 + hwctrl(mtd, offs & 0xff,
102 104 NAND_CTRL_ALE | NAND_CTRL_CHANGE); /* A[7:0] */
103   - this->cmd_ctrl(mtd, (offs >> 8) & 0xff, NAND_CTRL_ALE); /* A[11:9] */
  105 + hwctrl(mtd, (offs >> 8) & 0xff, NAND_CTRL_ALE); /* A[11:9] */
104 106 /* Row address */
105   - this->cmd_ctrl(mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */
106   - this->cmd_ctrl(mtd, ((page_addr >> 8) & 0xff),
  107 + hwctrl(mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */
  108 + hwctrl(mtd, ((page_addr >> 8) & 0xff),
107 109 NAND_CTRL_ALE); /* A[27:20] */
108 110 #ifdef CONFIG_SYS_NAND_5_ADDR_CYCLE
109 111 /* One more address cycle for devices > 128MiB */
110   - this->cmd_ctrl(mtd, (page_addr >> 16) & 0x0f,
  112 + hwctrl(mtd, (page_addr >> 16) & 0x0f,
111 113 NAND_CTRL_ALE); /* A[31:28] */
112 114 #endif
113 115 /* Latch in address */
114   - this->cmd_ctrl(mtd, NAND_CMD_READSTART,
  116 + hwctrl(mtd, NAND_CMD_READSTART,
115 117 NAND_CTRL_CLE | NAND_CTRL_CHANGE);
116   - this->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
  118 + hwctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
117 119  
118 120 /*
119 121 * Wait a while for the data to be ready