X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fsiemens-am33x-common.h;h=c53bd6689078dae42225b38e796636dfb9628e28;hb=0a9ef45158d586017839d4b6fccd7f8f16672156;hp=ae26dad4aa61c47120b00a6cb504b808b907548c;hpb=3c5d51fffc92417b38a2c94f4253e9a8a04100b8;p=u-boot diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ae26dad4aa..7ef95faca4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -14,10 +14,6 @@ #ifndef __CONFIG_SIEMENS_AM33X_COMMON_H #define __CONFIG_SIEMENS_AM33X_COMMON_H -#define CONFIG_AM33XX -#define CONFIG_OMAP -#define CONFIG_OMAP_COMMON - #include #define CONFIG_DMA_COHERENT @@ -26,8 +22,6 @@ #define CONFIG_ENV_SIZE (0x2000) #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) #define CONFIG_SYS_LONGHELP /* undef to save memory */ -#define CONFIG_BOARD_LATE_INIT -#define CONFIG_SYS_NO_FLASH #ifdef CONFIG_SIEMENS_MACH_TYPE #define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE #endif @@ -36,8 +30,6 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_SYS_CACHELINE_SIZE 64 - /* commands to include */ #define CONFIG_ENV_VARS_UBOOT_CONFIG @@ -46,7 +38,6 @@ #endif #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING @@ -63,10 +54,6 @@ /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 1024 -/* Print Buffer Size */ -#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ - + sizeof(CONFIG_SYS_PROMPT) + 16) - /* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE @@ -80,13 +67,7 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_OMAP_HSMMC -#define CONFIG_DOS_PARTITION - #define CONFIG_SPI -#define CONFIG_OMAP3_SPI #define CONFIG_MTD_DEVICE #define CONFIG_SF_DEFAULT_SPEED (75000000) @@ -102,15 +83,14 @@ #define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ /* NS16550 Configuration */ +#ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) +#endif #define CONFIG_SYS_NS16550_CLK (48000000) #define CONFIG_SYS_NS16550_COM1 0x44e09000 #define CONFIG_SYS_NS16550_COM4 0x481a6000 -#define CONFIG_BAUDRATE 115200 - -#define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SERIAL1 1 #define CONFIG_CONS_INDEX 1 @@ -119,46 +99,26 @@ #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 #define CONFIG_SYS_OMAP24_I2C_SLAVE 1 -#define CONFIG_SYS_I2C_OMAP24XX /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_TEXT_BASE 0x402F0400 -#define CONFIG_SPL_MAX_SIZE (101 * 1024) +#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ + CONFIG_SPL_TEXT_BASE) #define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" -#define CONFIG_SPL_MMC_SUPPORT -#define CONFIG_SPL_FAT_SUPPORT -#define CONFIG_FS_FAT -#define CONFIG_SPL_I2C_SUPPORT - -#define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_LIBDISK_SUPPORT -#define CONFIG_SPL_LIBGENERIC_SUPPORT -#define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_YMODEM_SUPPORT - -#define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_WATCHDOG_SUPPORT - -#define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT + #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" - -#define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_NAND_AM33XX_BCH -#define CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC +#define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) @@ -209,31 +169,18 @@ * USB configuration */ #define CONFIG_USB_MUSB_DSPS -#define CONFIG_ARCH_MISC_INIT #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -#undef CONFIG_USB_GADGET_DUALSPEED #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST -#ifdef CONFIG_USB_MUSB_HOST -#define CONFIG_USB_STORAGE -#endif - -#ifdef CONFIG_USB_MUSB_GADGET -#define CONFIG_USB_ETHER -#define CONFIG_USB_ETH_RNDIS -#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" -#endif /* CONFIG_USB_MUSB_GADGET */ /* USB DRACO ID as default */ #define CONFIG_USBD_HS /* USB Device Firmware Update support */ -#define CONFIG_USB_FUNCTION_DFU -#define CONFIG_DFU_NAND #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20) #define DFU_MANIFEST_POLL_TIMEOUT 25000 @@ -252,20 +199,13 @@ * 0x442000 - 0x800000 : Userland */ #if defined(CONFIG_SPI_BOOT) -# undef CONFIG_ENV_IS_NOWHERE -# define CONFIG_ENV_IS_IN_SPI_FLASH # define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED # define CONFIG_ENV_OFFSET (892 << 10) /* 892 KiB in */ # define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ #endif /* SPI support */ -/* Unsupported features */ -#undef CONFIG_USE_IRQ - #define CONFIG_DRIVER_TI_CPSW #define CONFIG_MII -#define CONFIG_PHY_GIGE -#define CONFIG_PHYLIB #define CONFIG_BOOTP_DEFAULT #define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 @@ -274,22 +214,12 @@ #define CONFIG_BOOTP_SUBNETMASK #define CONFIG_NET_RETRY_COUNT 10 -#define CONFIG_NAND /* NAND support */ #ifdef CONFIG_NAND -#define CONFIG_CMD_NAND - /* UBI Support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_DEVICE -#define CONFIG_RBTREE -#define CONFIG_LZO -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -#define CONFIG_MTD_UBI_FASTMAP -#define CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT 1 #endif /* Commen environment */ @@ -421,7 +351,7 @@ "setenv nand_src_addr ${nand_src_addr_B};" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ - "ubi.mtd=9,2048;" \ + "ubi.mtd=9,${ubi_off};" \ "setenv bootargs ${bootargs} " \ "root=${nand_root} noinitrd ${mtdparts} " \ "rootfstype=${nand_root_fs_type} ip=${ip_method} " \ @@ -513,7 +443,7 @@ COMMON_ENV_DFU_ARGS \ "dfu_alt_info=" DFU_ALT_INFO_NAND_V2 "\0" \ COMMON_ENV_NAND_BOOT \ - "ubi part rootfs 2048;" \ + "ubi part rootfs ${ubi_off};" \ "ubifsmount ubi0:${nand_active_ubi_vol};" \ "ubifsload ${kloadaddr} boot/${kernel_name};" \ "ubifsload ${loadaddr} boot/${dtb_name}.dtb;" \ @@ -570,28 +500,17 @@ "512k(mtdoops)," \ "-(configuration)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BASE (0x08000000) /* physical address */ /* to access nand at */ /* CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ #if !defined(CONFIG_SPI_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ #endif #endif -#define CONFIG_OMAP_GPIO - -/* Gpio cmd support */ - -/* Watchdog */ -#define CONFIG_HW_WATCHDOG - /* Reboot after 60 sec if bootcmd fails */ #define CONFIG_RESET_TO_RETRY #define CONFIG_BOOT_RETRY_TIME 60