Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cc3023b9f95d7ac959a764471a65001062aecf41

Authored by Rafal Jaworowski
Committed by Detlev Zundel
1 parent 3a6cab844c
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

Fix breakage of 8xx boards from recent commit. 

This patch fixes the negative consequences for 8xx of the recent
"ppc4xx: Clean up 440 exceptions handling" commit.

Signed-off-by: Rafal Jaworowski <raj@semihalf.com>

Showing 2 changed files with 7 additions and 1 deletions Side-by-side Diff

include/asm-ppc/processor.h
Diff comments   View file @ cc3023b
... ... @@ -628,6 +628,12 @@
628 628 #define MAS6 SPRN_MAS6
629 629 #define MAS7 SPRN_MAS7
630 630  
  631 +#if defined(CONFIG_4xx) || defined(CONFIG_44x) || defined(CONFIG_MPC85xx)
  632 +#define DAR_DEAR DEAR
  633 +#else
  634 +#define DAR_DEAR DAR
  635 +#endif
  636 +
631 637 /* Device Control Registers */
632 638  
633 639 #define DCRN_BEAR 0x090 /* Bus Error Address Register */
include/ppc_asm.tmpl
Diff comments   View file @ cc3023b
... ... @@ -235,7 +235,7 @@
235 235 stw r22,_CTR(r21); \
236 236 mfspr r20,XER; \
237 237 stw r20,_XER(r21); \
238   - mfspr r20,DEAR; \
  238 + mfspr r20, DAR_DEAR; \
239 239 stw r20,_DAR(r21); \
240 240 mfspr r22,reg1; \
241 241 mfspr r23,reg2; \