Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 4b0a03d3756c0bb8f25a9b9df3530e4129a6a70c

Authored by Stefan Roese
Committed by Wolfgang Denk
1 parent 13e95e4230
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

ppc: Fix DBSR_IAx defines in <bedbug/regs.h> 

While adding asm/cache.h to common.h for PPC targets, I got an
error about multiple definitions of some DBSR_ macros. While
scanning these defines, I noticed that some where defined not
correctly for all PPC variants. So I removed all unused defines,
and corrected the ones really used by bedbug (book-e vs. ppc40x).

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Wolfgang Denk <wd@denx.de>

Showing 1 changed file with 15 additions and 16 deletions Side-by-side Diff

include/bedbug/regs.h
Diff comments   View file @ 4b0a03d
... ... @@ -143,22 +143,21 @@
143 143 #define DBCR1_DV1BE 0x0000F000
144 144 #define DBCR1_DV2BE 0x00000F00
145 145  
146   -/* Bits for the DBSR register */
147   -#define DBSR_IC 0x80000000
148   -#define DBSR_BT 0x40000000
149   -#define DBSR_EDE 0x20000000
150   -#define DBSR_TIE 0x10000000
151   -#define DBSR_UDE 0x08000000
152   -#define DBSR_IA1 0x04000000
153   -#define DBSR_IA2 0x02000000
154   -#define DBSR_DR1 0x01000000
155   -#define DBSR_DW1 0x00800000
156   -#define DBSR_DR2 0x00400000
157   -#define DBSR_DW2 0x00200000
158   -#define DBSR_IDE 0x00100000
159   -#define DBSR_IA3 0x00080000
160   -#define DBSR_IA4 0x00040000
161   -#define DBSR_MRR 0x00000300
  146 +/*
  147 + * DBSR bits which have conflicting definitions on true Book E versus PPC40x
  148 + */
  149 +#ifdef CONFIG_BOOKE
  150 +#define DBSR_IA1 0x00800000 /* Instr Address Compare 1 Event */
  151 +#define DBSR_IA2 0x00400000 /* Instr Address Compare 2 Event */
  152 +#define DBSR_IA3 0x00200000 /* Instr Address Compare 3 Event */
  153 +#define DBSR_IA4 0x00100000 /* Instr Address Compare 4 Event */
  154 +#endif
  155 +#ifndef CONFIG_440
  156 +#define DBSR_IA1 0x04000000 /* Instr Address Compare 1 Event */
  157 +#define DBSR_IA2 0x02000000 /* Instr Address Compare 2 Event */
  158 +#define DBSR_IA3 0x00080000 /* Instr Address Compare 3 Event */
  159 +#define DBSR_IA4 0x00040000 /* Instr Address Compare 4 Event */
  160 +#endif
162 161  
163 162 struct spr_info {
164 163 int spr_val;