X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fconfigs%2Fbrppt1.h;h=4c56a8a59b0787873dd3c3734483ab0d8db53a1b;hb=92832045c54586e9dffa082ff8cd8c2ef6040757;hp=e01d53565cb382c6f82e3765c047966b3e0a3cfe;hpb=02e69a5db1b5e89a56c777d2b750dadcf26555a0;p=platform%2Fkernel%2Fu-boot.git diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index e01d535..4c56a8a 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * brtpp1.h * @@ -5,8 +6,6 @@ * * Copyright (C) 2013 Hannes Schmelzer - * Bernecker & Rainer Industrieelektronik GmbH - http://www.br-automation.com - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_BRPPT1_H__ @@ -14,24 +13,10 @@ #include #include +#include /* ------------------------------------------------------------------------- */ -#define CONFIG_AM335X_LCD -#define CONFIG_LCD -#define CONFIG_LCD_ROTATION -#define CONFIG_LCD_DT_SIMPLEFB -#define CONFIG_SYS_WHITE_ON_BLACK -#define LCD_BPP LCD_COLOR32 - -#define CONFIG_HW_WATCHDOG -#define CONFIG_OMAP_WATCHDOG - -/* Bootcount using the RTC block */ -#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 -#define CONFIG_BOOTCOUNT_LIMIT -#define CONFIG_BOOTCOUNT_AM33XX - /* memory */ -#define CONFIG_SYS_MALLOC_LEN (5 * 1024 * 1024) +#define CONFIG_SYS_BOOTM_LEN SZ_32M /* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ @@ -39,36 +24,12 @@ #define CONFIG_POWER_TPS65217 -/* Support both device trees and ATAGs. */ -#define CONFIG_USE_FDT /* use fdt within board code */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/*#define CONFIG_MACH_TYPE 3589*/ -#define CONFIG_MACH_TYPE 0xFFFFFFFF /* TODO: check with kernel*/ - -/* MMC/SD IP block */ -#if defined(CONFIG_EMMC_BOOT) - #define CONFIG_MMC - #define CONFIG_GENERIC_MMC - #define CONFIG_OMAP_HSMMC - #define CONFIG_SUPPORT_EMMC_BOOT -/* RAW SD card / eMMC locations. */ - #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /*addr. 0x60000 */ - #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ -#endif /* CONFIG_EMMC_BOOT */ - /* - * When we have SPI or NAND flash we expect to be making use of mtdparts, + * When we have NAND flash we expect to be making use of mtdparts, * both for ease of use in U-Boot and for passing information on to * the Linux kernel. */ -#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NAND) -#define CONFIG_MTD_DEVICE /* Required for mtdparts */ -#define CONFIG_CMD_MTDPARTS -#endif /* CONFIG_SPI_BOOT, ... */ -#undef CONFIG_SPL_OS_BOOT #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_SYS_SPL_ARGS_ADDR 0x80F80000 @@ -78,138 +39,111 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ /* NAND */ -#ifdef CONFIG_NAND -#define CONFIG_CMD_SPL_NAND_OFS 0x080000 /* end of u-boot */ +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x140000 -#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 -#endif /* CONFIG_NAND */ +#endif /* CONFIG_MTD_RAW_NAND */ #endif /* CONFIG_SPL_OS_BOOT */ -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* OMAP4 and later ELM support */ -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#endif /* CONFIG_NAND */ - -/* Always 64 KiB env size */ -#define CONFIG_ENV_SIZE (64 << 10) - -#ifdef CONFIG_NAND -#define NANDARGS \ - "mtdids=" MTDIDS_DEFAULT "\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ - "nandargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "${optargs_rot} " \ - "root=mtd6 " \ - "rootfstype=jffs2\0" \ - "kernelsize=0x400000\0" \ - "nandboot=echo booting from nand ...; " \ - "run nandargs; " \ - "nand read ${loadaddr} kernel ${kernelsize}; " \ - "bootz ${loadaddr} - ${dtbaddr}\0" \ - "defboot=run nandboot\0" \ - "bootlimit=1\0" \ - "simplefb=1\0 " \ - "altbootcmd=run usbscript\0" +#endif /* CONFIG_MTD_RAW_NAND */ + +#ifdef CONFIG_MTD_RAW_NAND +#define NANDTGTS \ +"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ +"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ +"cfgscr=mw ${dtbaddr} 0; nand read ${cfgaddr} cfgscr && source ${cfgaddr};" \ +" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" \ +"nandargs=setenv bootargs console=${console} ${optargs} ${optargs_rot} " \ + "root=mtd6 rootfstype=jffs2 b_mode=${b_mode}\0" \ +"b_nand=nand read ${loadaddr} kernel; nand read ${dtbaddr} dtb; " \ + "run nandargs; run cfgscr; bootz ${loadaddr} - ${dtbaddr}\0" \ +"b_tgts_std=usb0 nand net\0" \ +"b_tgts_rcy=net usb0 nand\0" \ +"b_tgts_pme=usb0 nand net\0" #else -#define NANDARGS "" -#endif /* CONFIG_NAND */ - -#ifdef CONFIG_MMC -#define MMCARGS \ -"dtbdev=mmc\0" \ -"dtbpart=0:1\0" \ -"mmcroot0=setenv bootargs ${optargs_rot} ${optargs} console=${console}\0" \ -"mmcroot1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \ - "root=/dev/mmcblk0p2 rootfstype=ext4\0" \ -"mmcboot0=echo booting Updatesystem from mmc (ext4-fs) ...; " \ - "setenv simplefb 1; " \ - "ext4load mmc 0:1 ${loadaddr} /${kernel}; " \ - "ext4load mmc 0:1 ${ramaddr} /${ramdisk}; " \ - "run mmcroot0; bootz ${loadaddr} ${ramaddr} ${dtbaddr};\0" \ -"mmcboot1=echo booting PPT-OS from mmc (ext4-fs) ...; " \ - "setenv simplefb 0; " \ - "ext4load mmc 0:2 ${loadaddr} /boot/${kernel}; " \ - "run mmcroot1; bootz ${loadaddr} - ${dtbaddr};\0" \ -"defboot=ext4load mmc 0:2 ${loadaddr} /boot/PPTImage.md5 && run mmcboot1; " \ - "ext4load mmc 0:1 ${dtbaddr} /$dtb && run mmcboot0; " \ - "run ramboot; run usbscript;\0" \ -"bootlimit=1\0" \ -"altbootcmd=run mmcboot0;\0" \ -"upduboot=dhcp; " \ - "tftp ${loadaddr} MLO && mmc write ${loadaddr} 100 100; " \ - "tftp ${loadaddr} u-boot.img && mmc write ${loadaddr} 300 400;\0" +#define NANDTGTS "" +#endif /* CONFIG_MTD_RAW_NAND */ + +#define MMCSPI_TGTS \ +"t30args#0=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \ + "b_mode=${b_mode} root=/dev/mmcblk0p2 rootfstype=ext4\0" \ +"b_t30lgcy#0=" \ + "load ${loaddev}:2 ${loadaddr} /boot/PPTImage.md5 && " \ + "load ${loaddev}:2 ${loadaddr} /boot/zImage && " \ + "load ${loaddev}:2 ${dtbaddr} /boot/am335x-ppt30.dtb || " \ + "load ${loaddev}:1 ${dtbaddr} am335x-ppt30-legacy.dtb; "\ + "run t30args#0; run cfgscr; bootz ${loadaddr} - ${dtbaddr}\0" \ +"t30args#1=setenv bootargs ${optargs_rot} ${optargs} console=${console} " \ + "b_mode=${b_mode}\0" \ +"b_t30lgcy#1=" \ + "load ${loaddev}:1 ${loadaddr} zImage && " \ + "load ${loaddev}:1 ${dtbaddr} am335x-ppt30.dtb && " \ + "load ${loaddev}:1 ${ramaddr} rootfsPPT30.uboot && " \ + "run t30args#1; run cfgscr; bootz ${loadaddr} ${ramaddr} ${dtbaddr}\0" \ +"b_mmc0=load ${loaddev}:1 ${scraddr} bootscr.img && source ${scraddr}\0" \ +"b_mmc1=load ${loaddev}:1 ${scraddr} /boot/bootscr.img && source ${scraddr}\0" \ +"b_tgts_std=mmc0 mmc1 t30lgcy#0 t30lgcy#1 usb0 net\0" \ +"b_tgts_rcy=t30lgcy#1 usb0 net\0" \ +"b_tgts_pme=net usb0 mmc0 mmc1\0" \ +"loaddev=mmc 1\0" + +#ifdef CONFIG_ENV_IS_IN_MMC +#define MMCTGTS \ +MMCSPI_TGTS \ +"cfgscr=mw ${dtbaddr} 0;" \ +" mmc dev 1; mmc read ${cfgaddr} 200 80; source ${cfgaddr};" \ +" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" #else -#define MMCARGS "" +#define MMCTGTS "" #endif /* CONFIG_MMC */ +#ifdef CONFIG_SPI +#define SPITGTS \ +MMCSPI_TGTS \ +"cfgscr=mw ${dtbaddr} 0;" \ +" sf probe; sf read ${cfgaddr} 0xC0000 10000; source ${cfgaddr};" \ +" fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" +#else +#define SPITGTS "" +#endif /* CONFIG_SPI */ + +#define LOAD_OFFSET(x) 0x8##x + #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ BUR_COMMON_ENV \ "verify=no\0" \ "autoload=0\0" \ -"dtb=bur-ppt-ts30.dtb\0" \ -"dtbaddr=0x80100000\0" \ -"loadaddr=0x80200000\0" \ -"ramaddr=0x80A00000\0" \ -"kernel=zImage\0" \ -"ramdisk=rootfs.cpio.uboot\0" \ +"scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \ +"cfgaddr=" __stringify(LOAD_OFFSET(0020000)) "\0" \ +"dtbaddr=" __stringify(LOAD_OFFSET(0040000)) "\0" \ +"loadaddr=" __stringify(LOAD_OFFSET(0100000)) "\0" \ +"ramaddr=" __stringify(LOAD_OFFSET(2000000)) "\0" \ "console=ttyO0,115200n8\0" \ "optargs=consoleblank=0 quiet panic=2\0" \ -"nfsroot=/tftpboot/tseries/rootfs-small\0" \ -"nfsopts=nolock\0" \ -"ramargs=setenv bootargs ${optargs} console=${console} root=/dev/ram0\0" \ -"netargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "root=/dev/nfs " \ - "nfsroot=${serverip}:${nfsroot},${nfsopts} rw " \ - "ip=dhcp\0" \ -"netboot=echo Booting from network ...; " \ - "dhcp; " \ - "tftp ${loadaddr} ${kernel}; " \ - "tftp ${dtbaddr} ${dtb}; " \ - "run netargs; " \ - "bootz ${loadaddr} - ${dtbaddr}\0" \ -"ramboot=echo Booting from network into RAM ...; "\ - "if dhcp; then; " \ - "tftp ${loadaddr} ${kernel}; " \ - "tftp ${ramaddr} ${ramdisk}; " \ - "if ext4load ${dtbdev} ${dtbpart} ${dtbaddr} /${dtb}; " \ - "then; else tftp ${dtbaddr} ${dtb}; fi;" \ - "run mmcroot0; " \ - "bootz ${loadaddr} ${ramaddr} ${dtbaddr}; fi;\0" \ -"netupdate=echo Updating UBOOT from Network (TFTP) ...; " \ - "setenv autoload 0; " \ - "dhcp && tftp 0x80000000 updateUBOOT.img && source;\0" \ -NANDARGS \ -MMCARGS +"b_break=0\0" \ +"b_usb0=usb start && load usb 0 ${scraddr} bootscr.img && source ${scraddr}\0" \ +"b_net=tftp ${scraddr} netscript.img && source ${scraddr}\0" \ +MMCTGTS \ +SPITGTS \ +NANDTGTS \ +"b_deftgts=if test ${b_mode} = 12; then setenv b_tgts ${b_tgts_pme};" \ +" elif test ${b_mode} = 0; then setenv b_tgts ${b_tgts_rcy};" \ +" else setenv b_tgts ${b_tgts_std}; fi\0" \ +"b_default=run b_deftgts; for target in ${b_tgts};"\ +" do echo \"### booting ${target} ###\"; run b_${target};" \ +" if test ${b_break} = 1; then; exit; fi; done\0" #endif /* !CONFIG_SPL_BUILD*/ -#define CONFIG_BOOTCOMMAND \ - "run defboot;" - -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND /* * GPMC block. We support 1 device and the physical address to * access CS0 at is 0x8000000. */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x8000000 -#define CONFIG_NAND_OMAP_GPMC /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */ -#define CONFIG_NAND_OMAP_ELM -#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW -#define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) -#define CONFIG_SYS_NAND_PAGE_SIZE 2048 -#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ - CONFIG_SYS_NAND_PAGE_SIZE) -#define CONFIG_SYS_NAND_OOBSIZE 64 -#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ 18, 19, 20, 21, 22, 23, 24, 25, \ @@ -222,77 +156,12 @@ MMCARGS #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define MTDIDS_DEFAULT "nand0=omap2-nand.0" -#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \ - "128k(MLO)," \ - "128k(MLO.backup)," \ - "128k(dtb)," \ - "128k(u-boot-env)," \ - "512k(u-boot)," \ - "4m(kernel),"\ - "128m(rootfs),"\ - "-(user)" #define CONFIG_NAND_OMAP_GPMC_WSCFG 1 -#endif /* CONFIG_NAND */ - -/* 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 -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_HOST -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_HOST - -#if defined(CONFIG_SPI_BOOT) -/* McSPI IP block */ -#define CONFIG_SPI -#define CONFIG_OMAP3_SPI -#define CONFIG_SF_DEFAULT_SPEED 24000000 - -#define CONFIG_SPL_SPI_LOAD -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ -#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */ -#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ - -#elif defined(CONFIG_EMMC_BOOT) -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 2 -#define CONFIG_ENV_OFFSET 0x40000 /* TODO: Adresse definieren */ -#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#endif /* CONFIG_MTD_RAW_NAND */ -#elif defined(CONFIG_NAND) -/* No NAND env support in SPL */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_ENV_IS_NOWHERE -#else -#define CONFIG_ENV_IS_IN_NAND -#endif -#define CONFIG_ENV_OFFSET 0x60000 +#if defined(CONFIG_ENV_IS_IN_NAND) #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_ENV_SIZE -#else -#error "no storage for Environment defined!" #endif -/* - * Common filesystems support. When we have removable storage we - * enabled a number of useful commands and support. - */ -#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) -#define CONFIG_DOS_PARTITION -#define CONFIG_FAT_WRITE -#define CONFIG_FS_EXT4 -#define CONFIG_EXT4_WRITE -#endif /* CONFIG_MMC, ... */ #endif /* ! __CONFIG_BRPPT1_H__ */