hw/arm/omap: Delete unused #defines
Delete some #defines which we no longer use because they are for OMAP SoCs which we dropped support for. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260512203414.3633237-6-peter.maydell@linaro.org
Peter Maydell committed
May 12, 2026 at 21:34 UTC
89d188f1939dcebfd372c09c0656d3c4132bfc01
1 file changed
-185
include/hw/arm/omap.h
-185
@@ -35,10 +35,7 @@
35
#define OMAP_LOCALBUS_BASE 0x30000000
36
#define OMAP_MPUI_BASE 0xe1000000
37
38
-#define OMAP730_SRAM_SIZE 0x00032000
38
#define OMAP15XX_SRAM_SIZE 0x00030000
40
-#define OMAP16XX_SRAM_SIZE 0x00004000
41
-#define OMAP1611_SRAM_SIZE 0x0003e800
39
#define OMAP_CS0_SIZE 0x04000000
40
#define OMAP_CS1_SIZE 0x04000000
41
#define OMAP_CS2_SIZE 0x04000000
@@ -130,16 +127,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
127
* Common OMAP-15xx IRQ numbers for level 1 interrupt handler
128
*/
129
#define OMAP_INT_15XX_IH2_IRQ 0
133
-#define OMAP_INT_15XX_LB_MMU 17
134
-#define OMAP_INT_15XX_LOCAL_BUS 29
135
-
136
-/*
137
- * OMAP-1510 specific IRQ numbers for level 1 interrupt handler
138
- */
139
-#define OMAP_INT_1510_SPI_TX 4
140
-#define OMAP_INT_1510_SPI_RX 5
141
-#define OMAP_INT_1510_DSP_MAILBOX1 10
142
-#define OMAP_INT_1510_DSP_MAILBOX2 11
130
131
/*
132
* OMAP-310 specific IRQ numbers for level 1 interrupt handler
@@ -149,42 +136,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
136
#define OMAP_INT_310_HSB_MAILBOX1 12
137
#define OMAP_INT_310_HSAB_MMU 18
138
152
-/*
153
- * OMAP-1610 specific IRQ numbers for level 1 interrupt handler
154
- */
155
-#define OMAP_INT_1610_IH2_IRQ 0
156
-#define OMAP_INT_1610_IH2_FIQ 2
157
-#define OMAP_INT_1610_McBSP2_TX 4
158
-#define OMAP_INT_1610_McBSP2_RX 5
159
-#define OMAP_INT_1610_DSP_MAILBOX1 10
160
-#define OMAP_INT_1610_DSP_MAILBOX2 11
161
-#define OMAP_INT_1610_LCD_LINE 12
162
-#define OMAP_INT_1610_GPTIMER1 17
163
-#define OMAP_INT_1610_GPTIMER2 18
164
-#define OMAP_INT_1610_SSR_FIFO_0 29
165
-
166
-/*
167
- * OMAP-730 specific IRQ numbers for level 1 interrupt handler
168
- */
169
-#define OMAP_INT_730_IH2_FIQ 0
170
-#define OMAP_INT_730_IH2_IRQ 1
171
-#define OMAP_INT_730_USB_NON_ISO 2
172
-#define OMAP_INT_730_USB_ISO 3
173
-#define OMAP_INT_730_ICR 4
174
-#define OMAP_INT_730_EAC 5
175
-#define OMAP_INT_730_GPIO_BANK1 6
176
-#define OMAP_INT_730_GPIO_BANK2 7
177
-#define OMAP_INT_730_GPIO_BANK3 8
178
-#define OMAP_INT_730_McBSP2TX 10
179
-#define OMAP_INT_730_McBSP2RX 11
180
-#define OMAP_INT_730_McBSP2RX_OVF 12
181
-#define OMAP_INT_730_LCD_LINE 14
182
-#define OMAP_INT_730_GSM_PROTECT 15
183
-#define OMAP_INT_730_TIMER3 16
184
-#define OMAP_INT_730_GPIO_BANK5 17
185
-#define OMAP_INT_730_GPIO_BANK6 18
186
-#define OMAP_INT_730_SPGIO_WR 29
187
-
139
/*
140
* Common IRQ numbers for level 2 interrupt handler
141
*/
@@ -209,15 +160,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
160
#define OMAP_INT_RTC_ALARM 26
161
#define OMAP_INT_DSP_MMU 28
162
212
-/*
213
- * OMAP-1510 specific IRQ numbers for level 2 interrupt handler
214
- */
215
-#define OMAP_INT_1510_BT_MCSI1TX 16
216
-#define OMAP_INT_1510_BT_MCSI1RX 17
217
-#define OMAP_INT_1510_SoSSI_MATCH 19
218
-#define OMAP_INT_1510_MEM_STICK 27
219
-#define OMAP_INT_1510_COM_SPI_RO 31
220
-
163
/*
164
* OMAP-310 specific IRQ numbers for level 2 interrupt handler
165
*/
@@ -229,103 +171,6 @@ void omap_gpio_set_clk(Omap1GpioState *gpio, omap_clk clk);
171
#define OMAP_INT_310_USB_W2FC_NON_ISO 30
172
#define OMAP_INT_310_McBSP2RX_OF 31
173
232
-/*
233
- * OMAP-1610 specific IRQ numbers for level 2 interrupt handler
234
- */
235
-#define OMAP_INT_1610_FAC 0
236
-#define OMAP_INT_1610_USB_HHC_2 7
237
-#define OMAP_INT_1610_USB_OTG 8
238
-#define OMAP_INT_1610_SoSSI 9
239
-#define OMAP_INT_1610_BT_MCSI1TX 16
240
-#define OMAP_INT_1610_BT_MCSI1RX 17
241
-#define OMAP_INT_1610_SoSSI_MATCH 19
242
-#define OMAP_INT_1610_MEM_STICK 27
243
-#define OMAP_INT_1610_McBSP2RX_OF 31
244
-#define OMAP_INT_1610_STI 32
245
-#define OMAP_INT_1610_STI_WAKEUP 33
246
-#define OMAP_INT_1610_GPTIMER3 34
247
-#define OMAP_INT_1610_GPTIMER4 35
248
-#define OMAP_INT_1610_GPTIMER5 36
249
-#define OMAP_INT_1610_GPTIMER6 37
250
-#define OMAP_INT_1610_GPTIMER7 38
251
-#define OMAP_INT_1610_GPTIMER8 39
252
-#define OMAP_INT_1610_GPIO_BANK2 40
253
-#define OMAP_INT_1610_GPIO_BANK3 41
254
-#define OMAP_INT_1610_MMC2 42
255
-#define OMAP_INT_1610_CF 43
256
-#define OMAP_INT_1610_WAKE_UP_REQ 46
257
-#define OMAP_INT_1610_GPIO_BANK4 48
258
-#define OMAP_INT_1610_SPI 49
259
-#define OMAP_INT_1610_DMA_CH6 53
260
-#define OMAP_INT_1610_DMA_CH7 54
261
-#define OMAP_INT_1610_DMA_CH8 55
262
-#define OMAP_INT_1610_DMA_CH9 56
263
-#define OMAP_INT_1610_DMA_CH10 57
264
-#define OMAP_INT_1610_DMA_CH11 58
265
-#define OMAP_INT_1610_DMA_CH12 59
266
-#define OMAP_INT_1610_DMA_CH13 60
267
-#define OMAP_INT_1610_DMA_CH14 61
268
-#define OMAP_INT_1610_DMA_CH15 62
269
-#define OMAP_INT_1610_NAND 63
270
-
271
-/*
272
- * OMAP-730 specific IRQ numbers for level 2 interrupt handler
273
- */
274
-#define OMAP_INT_730_HW_ERRORS 0
275
-#define OMAP_INT_730_NFIQ_PWR_FAIL 1
276
-#define OMAP_INT_730_CFCD 2
277
-#define OMAP_INT_730_CFIREQ 3
278
-#define OMAP_INT_730_I2C 4
279
-#define OMAP_INT_730_PCC 5
280
-#define OMAP_INT_730_MPU_EXT_NIRQ 6
281
-#define OMAP_INT_730_SPI_100K_1 7
282
-#define OMAP_INT_730_SYREN_SPI 8
283
-#define OMAP_INT_730_VLYNQ 9
284
-#define OMAP_INT_730_GPIO_BANK4 10
285
-#define OMAP_INT_730_McBSP1TX 11
286
-#define OMAP_INT_730_McBSP1RX 12
287
-#define OMAP_INT_730_McBSP1RX_OF 13
288
-#define OMAP_INT_730_UART_MODEM_IRDA_2 14
289
-#define OMAP_INT_730_UART_MODEM_1 15
290
-#define OMAP_INT_730_MCSI 16
291
-#define OMAP_INT_730_uWireTX 17
292
-#define OMAP_INT_730_uWireRX 18
293
-#define OMAP_INT_730_SMC_CD 19
294
-#define OMAP_INT_730_SMC_IREQ 20
295
-#define OMAP_INT_730_HDQ_1WIRE 21
296
-#define OMAP_INT_730_TIMER32K 22
297
-#define OMAP_INT_730_MMC_SDIO 23
298
-#define OMAP_INT_730_UPLD 24
299
-#define OMAP_INT_730_USB_HHC_1 27
300
-#define OMAP_INT_730_USB_HHC_2 28
301
-#define OMAP_INT_730_USB_GENI 29
302
-#define OMAP_INT_730_USB_OTG 30
303
-#define OMAP_INT_730_CAMERA_IF 31
304
-#define OMAP_INT_730_RNG 32
305
-#define OMAP_INT_730_DUAL_MODE_TIMER 33
306
-#define OMAP_INT_730_DBB_RF_EN 34
307
-#define OMAP_INT_730_MPUIO_KEYPAD 35
308
-#define OMAP_INT_730_SHA1_MD5 36
309
-#define OMAP_INT_730_SPI_100K_2 37
310
-#define OMAP_INT_730_RNG_IDLE 38
311
-#define OMAP_INT_730_MPUIO 39
312
-#define OMAP_INT_730_LLPC_LCD_CTRL_OFF 40
313
-#define OMAP_INT_730_LLPC_OE_FALLING 41
314
-#define OMAP_INT_730_LLPC_OE_RISING 42
315
-#define OMAP_INT_730_LLPC_VSYNC 43
316
-#define OMAP_INT_730_WAKE_UP_REQ 46
317
-#define OMAP_INT_730_DMA_CH6 53
318
-#define OMAP_INT_730_DMA_CH7 54
319
-#define OMAP_INT_730_DMA_CH8 55
320
-#define OMAP_INT_730_DMA_CH9 56
321
-#define OMAP_INT_730_DMA_CH10 57
322
-#define OMAP_INT_730_DMA_CH11 58
323
-#define OMAP_INT_730_DMA_CH12 59
324
-#define OMAP_INT_730_DMA_CH13 60
325
-#define OMAP_INT_730_DMA_CH14 61
326
-#define OMAP_INT_730_DMA_CH15 62
327
-#define OMAP_INT_730_NAND 63
328
-
174
/* omap_dma.c */
175
enum omap_dma_model {
176
omap_dma_3_0,
@@ -437,9 +282,6 @@ struct omap_dma_lcd_channel_s {
282
#define OMAP_DMA_CAMERA_IF_RX 20
283
#define OMAP_DMA_MMC_TX 21
284
#define OMAP_DMA_MMC_RX 22
440
-#define OMAP_DMA_NAND 23 /* Not in OMAP310 */
441
-#define OMAP_DMA_IRQ_LCD_LINE 24 /* Not in OMAP310 */
442
-#define OMAP_DMA_MEMORY_STICK 25 /* Not in OMAP310 */
285
#define OMAP_DMA_USB_W2FC_RX0 26
286
#define OMAP_DMA_USB_W2FC_RX1 27
287
#define OMAP_DMA_USB_W2FC_RX2 28
@@ -447,33 +289,6 @@ struct omap_dma_lcd_channel_s {
289
#define OMAP_DMA_USB_W2FC_TX1 30
290
#define OMAP_DMA_USB_W2FC_TX2 31
291
450
-/* These are only for 1610 */
451
-#define OMAP_DMA_CRYPTO_DES_IN 32
452
-#define OMAP_DMA_SPI_TX 33
453
-#define OMAP_DMA_SPI_RX 34
454
-#define OMAP_DMA_CRYPTO_HASH 35
455
-#define OMAP_DMA_CCP_ATTN 36
456
-#define OMAP_DMA_CCP_FIFO_NOT_EMPTY 37
457
-#define OMAP_DMA_CMT_APE_TX_CHAN_0 38
458
-#define OMAP_DMA_CMT_APE_RV_CHAN_0 39
459
-#define OMAP_DMA_CMT_APE_TX_CHAN_1 40
460
-#define OMAP_DMA_CMT_APE_RV_CHAN_1 41
461
-#define OMAP_DMA_CMT_APE_TX_CHAN_2 42
462
-#define OMAP_DMA_CMT_APE_RV_CHAN_2 43
463
-#define OMAP_DMA_CMT_APE_TX_CHAN_3 44
464
-#define OMAP_DMA_CMT_APE_RV_CHAN_3 45
465
-#define OMAP_DMA_CMT_APE_TX_CHAN_4 46
466
-#define OMAP_DMA_CMT_APE_RV_CHAN_4 47
467
-#define OMAP_DMA_CMT_APE_TX_CHAN_5 48
468
-#define OMAP_DMA_CMT_APE_RV_CHAN_5 49
469
-#define OMAP_DMA_CMT_APE_TX_CHAN_6 50
470
-#define OMAP_DMA_CMT_APE_RV_CHAN_6 51
471
-#define OMAP_DMA_CMT_APE_TX_CHAN_7 52
472
-#define OMAP_DMA_CMT_APE_RV_CHAN_7 53
473
-#define OMAP_DMA_MMC2_TX 54
474
-#define OMAP_DMA_MMC2_RX 55
475
-#define OMAP_DMA_CRYPTO_DES_OUT 56
476
-
292
struct omap_uart_s;
293
struct omap_uart_s *omap_uart_init(hwaddr base,
294
qemu_irq irq, omap_clk fclk, omap_clk iclk,