diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 22:15:18 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 22:15:18 (GMT) |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /include/configs/dxr2.h | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | u-boot-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/dxr2.h')
| -rw-r--r-- | include/configs/dxr2.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/configs/dxr2.h b/include/configs/dxr2.h index cd553ec..1e42f5c 100644 --- a/include/configs/dxr2.h +++ b/include/configs/dxr2.h @@ -21,8 +21,8 @@ #define CONFIG_SYS_MPUCLK 275 #define DXR2_IOCTRL_VAL 0x18b -#define DDR_PLL_FREQ 266 -#define CONFIG_SPL_AM33XX_DO_NOT_ENABLE_RTC32K +#define DDR_PLL_FREQ 303 +#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 #define BOARD_DFU_BUTTON_LED 64 @@ -62,7 +62,7 @@ /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=dxr2\0" \ - "nand_img_size=0x300000\0" \ + "nand_img_size=0x400000\0" \ "optargs=\0" \ CONFIG_COMMON_ENV_SETTINGS @@ -75,10 +75,9 @@ "run dfu_start; " \ "reset; " \ "fi;" \ -"if ping ${serverip}; then " \ - "run net_nfs; " \ -"fi;" \ -"run nand_boot;" +"run nand_boot;" \ +"reset;" + #else #define CONFIG_BOOTDELAY 0 |