projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Convert all of our single license tags to Linux Kernel style
[oweals/u-boot.git]
/
board
/
ti
/
beagle
/
beagle.c
diff --git
a/board/ti/beagle/beagle.c
b/board/ti/beagle/beagle.c
index 7b37fbe299e58bb9aa9f3552f49e42d06b75d8c9..826aace3fba24ee91216d63d4f6dde7ddc3a3cd3 100644
(file)
--- a/
board/ti/beagle/beagle.c
+++ b/
board/ti/beagle/beagle.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2004-2011
* Texas Instruments, <www.ti.com>
/*
* (C) Copyright 2004-2011
* Texas Instruments, <www.ti.com>
@@
-10,17
+11,15
@@
* Richard Woodruff <r-woodruff2@ti.com>
* Syed Mohammed Khasim <khasim@ti.com>
*
* Richard Woodruff <r-woodruff2@ti.com>
* Syed Mohammed Khasim <khasim@ti.com>
*
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <dm.h>
#include <ns16550.h>
*/
#include <common.h>
#include <dm.h>
#include <ns16550.h>
-#ifdef CONFIG_
STATUS_LED
+#ifdef CONFIG_
LED_STATUS
#include <status_led.h>
#endif
#include <twl4030.h>
#include <status_led.h>
#endif
#include <twl4030.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <asm/io.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h>
#include <asm/io.h>
#include <asm/arch/mmc_host_def.h>
#include <asm/arch/mux.h>
@@
-29,14
+28,14
@@
#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/omap_musb.h>
#include <asm/gpio.h>
#include <asm/mach-types.h>
#include <asm/omap_musb.h>
-#include <
asm
/errno.h>
+#include <
linux
/errno.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/musb.h>
#include "beagle.h"
#include <command.h>
#include <linux/usb/ch9.h>
#include <linux/usb/gadget.h>
#include <linux/usb/musb.h>
#include "beagle.h"
#include <command.h>
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI
_HCD
#include <usb.h>
#include <asm/ehci-omap.h>
#endif
#include <usb.h>
#include <asm/ehci-omap.h>
#endif
@@
-73,13
+72,14
@@
static struct {
} expansion_config;
static const struct ns16550_platdata beagle_serial = {
} expansion_config;
static const struct ns16550_platdata beagle_serial = {
- OMAP34XX_UART3,
- 2,
- V_NS16550_CLK
+ .base = OMAP34XX_UART3,
+ .reg_shift = 2,
+ .clock = V_NS16550_CLK,
+ .fcr = UART_FCR_DEFVAL,
};
U_BOOT_DEVICE(beagle_uart) = {
};
U_BOOT_DEVICE(beagle_uart) = {
- "
serial_omap
",
+ "
ns16550_serial
",
&beagle_serial
};
&beagle_serial
};
@@
-95,13
+95,24
@@
int board_init(void)
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
/* boot param addr */
gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-#if defined(CONFIG_
STATUS_LED) && defined(STATUS_LED_BOOT
)
- status_led_set
(STATUS_LED_BOOT, STATUS_LED
_ON);
+#if defined(CONFIG_
LED_STATUS) && defined(CONFIG_LED_STATUS_BOOT_ENABLE
)
+ status_led_set
(CONFIG_LED_STATUS_BOOT, CONFIG_LED_STATUS
_ON);
#endif
return 0;
}
#endif
return 0;
}
+#if defined(CONFIG_SPL_OS_BOOT)
+int spl_start_uboot(void)
+{
+ /* break into full u-boot on 'c' */
+ if (serial_tstc() && serial_getc() == 'c')
+ return 1;
+
+ return 0;
+}
+#endif /* CONFIG_SPL_OS_BOOT */
+
/*
* Routine: get_board_revision
* Description: Detect if we are running on a Beagle revision Ax/Bx,
/*
* Routine: get_board_revision
* Description: Detect if we are running on a Beagle revision Ax/Bx,
@@
-306,12
+317,12
@@
static struct omap_musb_board_data musb_board_data = {
};
static struct musb_hdrc_platform_data musb_plat = {
};
static struct musb_hdrc_platform_data musb_plat = {
-#if defined(CONFIG_MUSB_HOST)
+#if defined(CONFIG_
USB_
MUSB_HOST)
.mode = MUSB_HOST,
.mode = MUSB_HOST,
-#elif defined(CONFIG_MUSB_GADGET)
+#elif defined(CONFIG_
USB_
MUSB_GADGET)
.mode = MUSB_PERIPHERAL,
#else
.mode = MUSB_PERIPHERAL,
#else
-#error "Please define either CONFIG_
MUSB_HOST or CONFIG
_MUSB_GADGET"
+#error "Please define either CONFIG_
USB_MUSB_HOST or CONFIG_USB
_MUSB_GADGET"
#endif
.config = &musb_config,
.power = 100,
#endif
.config = &musb_config,
.power = 100,
@@
-340,16
+351,16
@@
int misc_init_r(void)
switch (get_board_revision()) {
case REVISION_AXBX:
printf("Beagle Rev Ax/Bx\n");
switch (get_board_revision()) {
case REVISION_AXBX:
printf("Beagle Rev Ax/Bx\n");
-
setenv
("beaglerev", "AxBx");
+
env_set
("beaglerev", "AxBx");
break;
case REVISION_CX:
printf("Beagle Rev C1/C2/C3\n");
break;
case REVISION_CX:
printf("Beagle Rev C1/C2/C3\n");
-
setenv
("beaglerev", "Cx");
+
env_set
("beaglerev", "Cx");
MUX_BEAGLE_C();
break;
case REVISION_C4:
printf("Beagle Rev C4\n");
MUX_BEAGLE_C();
break;
case REVISION_C4:
printf("Beagle Rev C4\n");
-
setenv
("beaglerev", "C4");
+
env_set
("beaglerev", "C4");
MUX_BEAGLE_C();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
MUX_BEAGLE_C();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@
-359,7
+370,7
@@
int misc_init_r(void)
break;
case REVISION_XM_AB:
printf("Beagle xM Rev A/B\n");
break;
case REVISION_XM_AB:
printf("Beagle xM Rev A/B\n");
-
setenv
("beaglerev", "xMAB");
+
env_set
("beaglerev", "xMAB");
MUX_BEAGLE_XM();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
MUX_BEAGLE_XM();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@
-370,7
+381,7
@@
int misc_init_r(void)
break;
case REVISION_XM_C:
printf("Beagle xM Rev C\n");
break;
case REVISION_XM_C:
printf("Beagle xM Rev C\n");
-
setenv
("beaglerev", "xMC");
+
env_set
("beaglerev", "xMC");
MUX_BEAGLE_XM();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
MUX_BEAGLE_XM();
/* Set VAUX2 to 1.8V for EHCI PHY */
twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
@@
-396,14
+407,14
@@
int misc_init_r(void)
expansion_config.revision,
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
expansion_config.revision,
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
-
setenv
("buddy", "zippy");
+
env_set
("buddy", "zippy");
break;
case TINCANTOOLS_ZIPPY2:
printf("Recognized Tincantools Zippy2 board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
break;
case TINCANTOOLS_ZIPPY2:
printf("Recognized Tincantools Zippy2 board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
-
setenv
("buddy", "zippy2");
+
env_set
("buddy", "zippy2");
break;
case TINCANTOOLS_TRAINER:
printf("Recognized Tincantools Trainer board (rev %d %s)\n",
break;
case TINCANTOOLS_TRAINER:
printf("Recognized Tincantools Trainer board (rev %d %s)\n",
@@
-411,44
+422,44
@@
int misc_init_r(void)
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
MUX_TINCANTOOLS_TRAINER();
expansion_config.fab_revision);
MUX_TINCANTOOLS_ZIPPY();
MUX_TINCANTOOLS_TRAINER();
-
setenv
("buddy", "trainer");
+
env_set
("buddy", "trainer");
break;
case TINCANTOOLS_SHOWDOG:
printf("Recognized Tincantools Showdow board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
/* Place holder for DSS2 definition for showdog lcd */
break;
case TINCANTOOLS_SHOWDOG:
printf("Recognized Tincantools Showdow board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
/* Place holder for DSS2 definition for showdog lcd */
-
setenv
("defaultdisplay", "showdoglcd");
-
setenv
("buddy", "showdog");
+
env_set
("defaultdisplay", "showdoglcd");
+
env_set
("buddy", "showdog");
break;
case KBADC_BEAGLEFPGA:
printf("Recognized KBADC Beagle FPGA board\n");
MUX_KBADC_BEAGLEFPGA();
break;
case KBADC_BEAGLEFPGA:
printf("Recognized KBADC Beagle FPGA board\n");
MUX_KBADC_BEAGLEFPGA();
-
setenv
("buddy", "beaglefpga");
+
env_set
("buddy", "beaglefpga");
break;
case LW_BEAGLETOUCH:
printf("Recognized Liquidware BeagleTouch board\n");
break;
case LW_BEAGLETOUCH:
printf("Recognized Liquidware BeagleTouch board\n");
-
setenv
("buddy", "beagletouch");
+
env_set
("buddy", "beagletouch");
break;
case BRAINMUX_LCDOG:
printf("Recognized Brainmux LCDog board\n");
break;
case BRAINMUX_LCDOG:
printf("Recognized Brainmux LCDog board\n");
-
setenv
("buddy", "lcdog");
+
env_set
("buddy", "lcdog");
break;
case BRAINMUX_LCDOGTOUCH:
printf("Recognized Brainmux LCDog Touch board\n");
break;
case BRAINMUX_LCDOGTOUCH:
printf("Recognized Brainmux LCDog Touch board\n");
-
setenv
("buddy", "lcdogtouch");
+
env_set
("buddy", "lcdogtouch");
break;
case BBTOYS_WIFI:
printf("Recognized BeagleBoardToys WiFi board\n");
MUX_BBTOYS_WIFI()
break;
case BBTOYS_WIFI:
printf("Recognized BeagleBoardToys WiFi board\n");
MUX_BBTOYS_WIFI()
-
setenv
("buddy", "bbtoys-wifi");
- break;
;
+
env_set
("buddy", "bbtoys-wifi");
+ break;
case BBTOYS_VGA:
printf("Recognized BeagleBoardToys VGA board\n");
case BBTOYS_VGA:
printf("Recognized BeagleBoardToys VGA board\n");
- break;
;
+ break;
case BBTOYS_LCD:
printf("Recognized BeagleBoardToys LCD board\n");
case BBTOYS_LCD:
printf("Recognized BeagleBoardToys LCD board\n");
- break;
;
+ break;
case BCT_BRETTL3:
printf("Recognized bct electronic GmbH brettl3 board\n");
break;
case BCT_BRETTL3:
printf("Recognized bct electronic GmbH brettl3 board\n");
break;
@@
-458,20
+469,20
@@
int misc_init_r(void)
case LSR_COM6L_ADPT:
printf("Recognized LSR COM6L Adapter Board\n");
MUX_BBTOYS_WIFI()
case LSR_COM6L_ADPT:
printf("Recognized LSR COM6L Adapter Board\n");
MUX_BBTOYS_WIFI()
-
setenv
("buddy", "lsr-com6l-adpt");
+
env_set
("buddy", "lsr-com6l-adpt");
break;
case BEAGLE_NO_EEPROM:
printf("No EEPROM on expansion board\n");
break;
case BEAGLE_NO_EEPROM:
printf("No EEPROM on expansion board\n");
-
setenv
("buddy", "none");
+
env_set
("buddy", "none");
break;
default:
printf("Unrecognized expansion board: %x\n",
expansion_config.device_vendor);
break;
default:
printf("Unrecognized expansion board: %x\n",
expansion_config.device_vendor);
-
setenv
("buddy", "unknown");
+
env_set
("buddy", "unknown");
}
if (expansion_config.content == 1)
}
if (expansion_config.content == 1)
-
setenv
(expansion_config.env_var, expansion_config.env_setting);
+
env_set
(expansion_config.env_var, expansion_config.env_setting);
twl4030_power_init();
switch (get_board_revision()) {
twl4030_power_init();
switch (get_board_revision()) {
@@
-494,7
+505,7
@@
int misc_init_r(void)
writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe);
writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe);
-
dieid_num_r
();
+
omap_die_id_display
();
#ifdef CONFIG_VIDEO_OMAP3
beagle_dvi_pup();
#ifdef CONFIG_VIDEO_OMAP3
beagle_dvi_pup();
@@
-506,12
+517,16
@@
int misc_init_r(void)
musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
#endif
musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
#endif
- if (generate_fake_mac)
{
-
u32 id[4]
;
+ if (generate_fake_mac)
+
omap_die_id_usbethaddr()
;
- get_dieid(id);
- usb_fake_mac_from_die_id(id);
- }
+#if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT)
+ if (strlen(CONFIG_MTDIDS_DEFAULT))
+ env_set("mtdids", CONFIG_MTDIDS_DEFAULT);
+
+ if (strlen(CONFIG_MTDPARTS_DEFAULT))
+ env_set("mtdparts", CONFIG_MTDPARTS_DEFAULT);
+#endif
return 0;
}
return 0;
}
@@
-527,21
+542,21
@@
void set_muxconf_regs(void)
MUX_BEAGLE();
}
MUX_BEAGLE();
}
-#if defined(CONFIG_
GENERIC_MMC) && !defined(CONFIG_SPL_BUILD
)
+#if defined(CONFIG_
MMC
)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
#endif
-#if defined(CONFIG_
GENERIC_
MMC)
+#if defined(CONFIG_MMC)
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);
}
#endif
void board_mmc_power_init(void)
{
twl4030_power_mmc_init(0);
}
#endif
-#if defined(CONFIG_USB_EHCI) && !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_USB_EHCI
_HCD
) && !defined(CONFIG_SPL_BUILD)
/* Call usb_stop() before starting the kernel */
void show_boot_progress(int val)
{
/* Call usb_stop() before starting the kernel */
void show_boot_progress(int val)
{
@@
-566,9
+581,9
@@
int ehci_hcd_stop(int index)
return omap_ehci_hcd_stop();
}
return omap_ehci_hcd_stop();
}
-#endif /* CONFIG_USB_EHCI */
+#endif /* CONFIG_USB_EHCI
_HCD
*/
-#if defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)
+#if defined(CONFIG_USB_ETHER) && defined(CONFIG_
USB_
MUSB_GADGET)
int board_eth_init(bd_t *bis)
{
return usb_eth_initialize(bis);
int board_eth_init(bd_t *bis)
{
return usb_eth_initialize(bis);