diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/P2020COME.h | 8 | ||||
| -rw-r--r-- | include/configs/sbc35_a9g20.h | 3 | ||||
| -rw-r--r-- | include/configs/tny_a9260.h | 4 | ||||
| -rw-r--r-- | include/usb/lin_gadget_compat.h | 2 | ||||
| -rw-r--r-- | include/usb/s3c_udc.h | 20 |
5 files changed, 19 insertions, 18 deletions
diff --git a/include/configs/P2020COME.h b/include/configs/P2020COME.h index db88b683ead..cf20d2b2eee 100644 --- a/include/configs/P2020COME.h +++ b/include/configs/P2020COME.h @@ -103,12 +103,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END 0x1fffffff #define CONFIG_PANIC_HANG /* do not reset board on panic */ - - - - - - /* * Config the L2 Cache as L2 SRAM */ @@ -316,7 +310,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define _IO_BASE 0x00000000 #endif - #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_DOS_PARTITION @@ -563,6 +556,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); "tftp $fdtaddr $tftppath/$fdtfile;" \ "bootm $loadaddr - $fdtaddr" + #define CONFIG_RAMBOOTCOMMAND \ "setenv bootargs root=/dev/ram rw " \ "console=$consoledev,$baudrate $othbootargs;" \ diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h index 1e355a88100..cdf8659093d 100644 --- a/include/configs/sbc35_a9g20.h +++ b/include/configs/sbc35_a9g20.h @@ -36,6 +36,9 @@ #define CONFIG_ENV_IS_IN_EEPROM #endif +#define MACH_TYPE_SBC35_A9G20 1848 +#define CONFIG_MACH_TYPE MACH_TYPE_SBC35_A9G20 + /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12.000 MHz crystal */ diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h index ec8ec18ec5b..0043926ee6a 100644 --- a/include/configs/tny_a9260.h +++ b/include/configs/tny_a9260.h @@ -45,8 +45,12 @@ /* Define actual evaluation board type from used processor type */ #ifdef CONFIG_AT91SAM9G20 # define CONFIG_TNY_A9G20 +# define MACH_TYPE_TNY_A9G20 2059 +# define CONFIG_MACH_TYPE MACH_TYPE_TNY_A9G20 #else # define CONFIG_TNY_A9260 +# define MACH_TYPE_TNY_A9260 2058 +# define CONFIG_MACH_TYPE MACH_TYPE_TNY_A9260 #endif /* ARM asynchronous clock */ diff --git a/include/usb/lin_gadget_compat.h b/include/usb/lin_gadget_compat.h index 9b315118d5e..fce3be7e802 100644 --- a/include/usb/lin_gadget_compat.h +++ b/include/usb/lin_gadget_compat.h @@ -26,7 +26,7 @@ /* common */ #define spin_lock_init(...) #define spin_lock(...) -#define spin_lock_irqsave(lock, flags) do {flags = 1; } while (0) +#define spin_lock_irqsave(lock, flags) do { debug("%lu\n", flags); } while (0) #define spin_unlock(...) #define spin_unlock_irqrestore(lock, flags) do {flags = 0; } while (0) #define disable_irq(...) diff --git a/include/usb/s3c_udc.h b/include/usb/s3c_udc.h index 14dadc8b053..31d8f6cba09 100644 --- a/include/usb/s3c_udc.h +++ b/include/usb/s3c_udc.h @@ -131,16 +131,10 @@ extern struct s3c_udc *the_controller; #define DEBUG_EP0(fmt, args...) do {} while (0) #endif -#ifdef DEBUG_S3C_UDC -#define DEBUG(fmt, args...) printk(fmt, ##args) -#else -#define DEBUG(fmt, args...) do {} while (0) -#endif - #ifdef DEBUG_S3C_UDC_ISR -#define DEBUG_ISR(fmt, args...) printk(fmt, ##args) +#define DEBUG_ISR 1 #else -#define DEBUG_ISR(fmt, args...) do {} while (0) +#define DEBUG_ISR 0 #endif #ifdef DEBUG_S3C_UDC_OUT_EP @@ -150,9 +144,15 @@ extern struct s3c_udc *the_controller; #endif #ifdef DEBUG_S3C_UDC_IN_EP -#define DEBUG_IN_EP(fmt, args...) printk(fmt, ##args) +#define DEBUG_IN_EP 1 #else -#define DEBUG_IN_EP(fmt, args...) do {} while (0) +#define DEBUG_IN_EP 0 +#endif + +#if defined(DEBUG_S3C_UDC_SETUP) || defined(DEBUG_S3C_UDC_EP0) || \ + defined(DEBUG_S3C_UDC_ISR) || defined(DEBUG_S3C_UDC_OUT_EP) || \ + defined(DEBUG_S3C_UDC_IN_EP) || defined(DEBUG_S3C_UDC) +#define DEBUG #endif #define ERR(stuff...) printf("ERR udc: " stuff) |