From 9d05b8b578f132e55178fba5b6e63c3a12f4de50 Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Fri, 16 Jan 2015 16:59:04 +0900 Subject: Odroid-XU3: adjust to support Tizen requirements This patch includes changes required to boot Tizen, by varoius authors: arm: exynos5420: Adding support for board_usb_{init|cleanup}() functions Signed-off-by: Joonyoung Shim Signed-off-by: Lukasz Majewski samsung: common: board: call dwc3_uboot_exit() for boards with DWC3 Signed-off-by: Przemyslaw Marczak config: Odroid-XU3: Support DFU download Signed-off-by: Inha Song smdk5420: Add dfu_alt_info settings interface for support DFU download Signed-off-by: Inha Song Signed-off-by: Przemyslaw Marczak config: Odroid-XU3: Enable dwc3 usb gadget Signed-off-by: Joonyoung Shim config: Odroid-XU3: Add default dfu device environment Signed-off-by: Inha Song usb: config: odroid XU3: Enable UMS (Mass Storage) gadget Signed-off-by: Lukasz Majewski Odroid-XU3: Enable check board signature when download bootloader Signed-off-by: Inha Song odroid-xu3: config: add platform autoboot command Signed-off-by: Przemyslaw Marczak Odroid-XU3: Set rootfs device number to 0 Signed-off-by: Inha Song --- board/samsung/common/board.c | 4 ++ board/samsung/smdk5420/smdk5420.c | 65 +++++++++++++++++++++++ include/configs/odroid_xu3.h | 108 +++++++++++++++++++++++++++++++++++++- 3 files changed, 175 insertions(+), 2 deletions(-) diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index e359060870..b715bcdf6f 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -27,6 +27,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; @@ -423,5 +424,8 @@ void reset_misc(void) int board_usb_cleanup(int index, enum usb_init_type init) { +#ifdef CONFIG_USB_DWC3 + dwc3_uboot_exit(index); +#endif return 0; } diff --git a/board/samsung/smdk5420/smdk5420.c b/board/samsung/smdk5420/smdk5420.c index 82f607b24d..cab827ddc4 100644 --- a/board/samsung/smdk5420/smdk5420.c +++ b/board/samsung/smdk5420/smdk5420.c @@ -19,6 +19,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -75,3 +81,62 @@ int board_get_revision(void) { return 0; } + +static struct dwc3_device dwc3_device_data = { + .maximum_speed = USB_SPEED_SUPER, + .base = 0x12400000, + .dr_mode = USB_DR_MODE_PERIPHERAL, + .index = 0, +}; + +int usb_gadget_handle_interrupts(void) +{ + dwc3_uboot_handle_interrupt(0); + return 0; +} + +int board_usb_init(int index, enum usb_init_type init) +{ + struct exynos_usb3_phy *phy = (struct exynos_usb3_phy *) + samsung_get_base_usb3_phy(); + + if (!phy) { + error("usb3 phy not supported"); + return -ENODEV; + } + + set_usbdrd_phy_ctrl(POWER_USB_DRD_PHY_CTRL_EN); + exynos5_usb3_phy_init(phy); + + return dwc3_uboot_init(&dwc3_device_data); +} + +#ifdef CONFIG_SET_DFU_ALT_INFO +char *get_dfu_alt_system(char *interface, char *devstr) +{ + return getenv("dfu_alt_system"); +} + +char *get_dfu_alt_boot(char *interface, char *devstr) +{ + struct mmc *mmc; + char *alt_boot; + int dev_num; + + dev_num = simple_strtoul(devstr, NULL, 10); + + mmc = find_mmc_device(dev_num); + if (!mmc) + return NULL; + + if (mmc_init(mmc)) + return NULL; + + if (IS_SD(mmc)) + alt_boot = CONFIG_DFU_ALT_BOOT_SD; + else + alt_boot = CONFIG_DFU_ALT_BOOT_EMMC; + + return alt_boot; +} +#endif diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index c395020919..82d5ba3b3e 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -13,6 +13,7 @@ #define CONFIG_SYS_PROMPT "ODROID-XU3 # " #define CONFIG_IDENT_STRING " for ODROID-XU3" +#define CONFIG_SIG #define CONFIG_BOARD_COMMON #define CONFIG_SYS_SDRAM_BASE 0x40000000 @@ -23,7 +24,11 @@ #define TZPC_BASE_OFFSET 0x10000 +/* FLASH and environment organization */ +#define CONFIG_MMC_DEFAULT_DEV 0 + #define CONFIG_CMD_MMC +#define CONFIG_CMD_DFU #define CONFIG_NR_DRAM_BANKS 8 #define SDRAM_BANK_SIZE (256UL << 20UL) /* 256 MB */ @@ -35,8 +40,8 @@ #undef CONFIG_ENV_SIZE #undef CONFIG_ENV_OFFSET -#define CONFIG_ENV_SIZE 4096 -#define CONFIG_ENV_OFFSET (SZ_1K * 1280) /* 1.25 MiB offset */ +#define CONFIG_ENV_SIZE (SZ_1K * 16) +#define CONFIG_ENV_OFFSET (SZ_1K * 3136) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) @@ -46,6 +51,105 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_EXYNOS +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_DWC3_PHY_SAMSUNG + +/* USB Composite download gadget - g_dnl */ +#define CONFIG_USB_GADGET +#define CONFIG_USB_GADGET_DUALSPEED +#define CONFIG_USB_GADGET_VBUS_DRAW 2 +#define CONFIG_USBDOWNLOAD_GADGET + +/* TIZEN THOR downloader support */ +#define CONFIG_CMD_THOR_DOWNLOAD +#define CONFIG_THOR_FUNCTION + +#define CONFIG_DFU_FUNCTION +#define CONFIG_DFU_MMC +#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M +#define DFU_DEFAULT_POLL_TIMEOUT 300 + +/* USB Samsung's IDs */ +#define CONFIG_G_DNL_VENDOR_NUM 0x04E8 +#define CONFIG_G_DNL_PRODUCT_NUM 0x6601 +#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM +#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D +#define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525 +#define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5 +#define CONFIG_G_DNL_MANUFACTURER "Samsung" + +#define CONFIG_CMD_USB_MASS_STORAGE +#define CONFIG_USB_DWC3 +#define CONFIG_USB_DWC3_GADGET +#define CONFIG_USB_GADGET_MASS_STORAGE + +#define CONFIG_MISC_COMMON +#define CONFIG_MISC_INIT_R + +#include + +#undef CONFIG_BOOTCOMMAND +#define CONFIG_BOOTCOMMAND "run autoboot" + +#undef CONFIG_EXTRA_ENV_SETTINGS +#define CONFIG_EXTRA_ENV_SETTINGS \ + PLATFORM_BOOT_INFO \ + "checkboard=\0" \ + "bootdelay=0\0" \ + "rootfstype=ext4\0" \ + "console=" CONFIG_DEFAULT_CONSOLE \ + "fdtfile=exynos5422-odroidxu3.dtb\0" \ + "mmcbootpart=1\0" \ + "mmcrootdev=0\0" \ + "mmcrootpart=2\0" \ + "dfu_usb_con=0\0" \ + "dfu_interface=mmc\0" \ + "dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \ + "dfu_alt_system="CONFIG_DFU_ALT \ + "dfu_alt_info=Autoset by THOR/DFU command run.\0" + +/* Partitions name for Tizen 3.0 */ +#define PARTS_BOOT "boot" +#define PARTS_ROOT "platform" +#define PARTS_DATA "system-data" +#define PARTS_USER "user" +#define PARTS_MODULES "modules" + +#define CONFIG_DFU_ALT \ + "uImage fat 0 1;" \ + "zImage fat 0 1;" \ + "Image.itb fat 0 1;" \ + "uInitrd fat 0 1;" \ + "exynos5422-odroidxu3.dtb fat 0 1;" \ + ""PARTS_BOOT" part 0 1;" \ + ""PARTS_ROOT" part 0 2;" \ + ""PARTS_DATA" part 0 3;" \ + ""PARTS_USER" part 0 5;" \ + ""PARTS_MODULES" part 0 6\0" + +#define CONFIG_SET_DFU_ALT_INFO +#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) + +#define CONFIG_DFU_ALT_BOOT_EMMC \ + "u-boot raw 0x3e 0x800 mmcpart 1;" \ + "bl1 raw 0x0 0x1e mmcpart 1;" \ + "bl2 raw 0x1e 0x1d mmcpart 1;" \ + "tzsw raw 0x83e 0x200 mmcpart 1;" \ + "params.bin raw 0x1880 0x20\0" + +#define CONFIG_DFU_ALT_BOOT_SD \ + "u-boot raw 0x3f 0x800;" \ + "bl1 raw 0x1 0x1e;" \ + "bl2 raw 0x1f 0x1d;" \ + "tzsw raw 0x83f 0x200;" \ + "params.bin raw 0x1880 0x20\0" + +#define CONFIG_SET_DFU_ALT_INFO +#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) + /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */ #undef CONFIG_EXYNOS_TMU #undef CONFIG_TMU_CMD_DTT -- cgit v1.2.3