diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-05-01 17:21:35 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-05-04 17:52:56 +0200 |
commit | 7341581eb4990cff3255b6451742aa1c7ec0ee44 (patch) | |
tree | 53849f765c6c52b278deb4d3b937307ea14d6216 /board/toradex/apalis_imx6 | |
parent | cafd2c60cb8856db8976957823ee1059e28fa5ad (diff) |
toradex: common: create a place for common functionality
Some functionality is repetitve accross the boards. This creates
a common place for U-Boot functions which need to be implemented
similarly for all Toradex modules.
Diffstat (limited to 'board/toradex/apalis_imx6')
-rw-r--r-- | board/toradex/apalis_imx6/apalis_imx6.c | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 52ab253bd0..81ac092404 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -29,7 +29,6 @@ #include <netdev.h> #include <asm/arch/crm_regs.h> #include <asm/arch/mxc_hdmi.h> -#include <g_dnl.h> #include <i2c.h> #include "../common/configblock.h" @@ -806,37 +805,11 @@ int board_late_init(void) } #endif /* CONFIG_BOARD_LATE_INIT */ -int checkboard(void) +int checkboard_fallback(void) { -#ifdef CONFIG_TRDX_CFG_BLOCK - if (read_trdx_cfg_block()) - printf("Missing Toradex config block\n"); - else { - display_board_info(); - return 0; - } -#endif - printf("Model: Toradex Apalis iMX6 %s\n", (gd->ram_size == 0x80000000)?"2GB":(gd->ram_size == 0x40000000)?"1GB":"512MB"); - return 0; -} - -int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) -{ - unsigned short prodnr = 0; - unsigned short usb_pid; - /* assume a maximum 64bit serial */ - char serialnr[21]; - - get_board_product_number(&prodnr); - - put_unaligned(CONFIG_TRDX_VID, &dev->idVendor); - - usb_pid = prodnr + 0x100; - put_unaligned(usb_pid, &dev->idProduct); - - get_board_serial_char(serialnr); - g_dnl_set_serialnumber(serialnr); - + printf("Model: Toradex Apalis iMX6 %s\n", + (gd->ram_size == 0x80000000) ? "2GB" : + (gd->ram_size == 0x40000000) ? "1GB" : "512MB"); return 0; } |