projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
pxm2.h
diff --git
a/include/configs/pxm2.h
b/include/configs/pxm2.h
index
c8bc8f3
..
543eb2d
100644
(file)
--- a/
include/configs/pxm2.h
+++ b/
include/configs/pxm2.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* siemens pxm2
* (C) Copyright 2013 Siemens Schweiz AG
/*
* siemens pxm2
* (C) Copyright 2013 Siemens Schweiz AG
@@
-7,19
+8,15
@@
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
* U-Boot file:/include/configs/am335x_evm.h
*
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __CONFIG_PXM2_H
#define __CONFIG_PXM2_H
*/
#ifndef __CONFIG_PXM2_H
#define __CONFIG_PXM2_H
-#define CONFIG_SIEMENS_PXM2
#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2
#include "siemens-am33x-common.h"
#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2
#include "siemens-am33x-common.h"
-#define CONFIG_SYS_MPUCLK 720
#define DDR_IOCTRL_VAL 0x18b
#define DDR_PLL_FREQ 266
#define DDR_IOCTRL_VAL 0x18b
#define DDR_PLL_FREQ 266
@@
-43,13
+40,9
@@
#define CONFIG_FACTORYSET
#define CONFIG_FACTORYSET
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
#ifndef CONFIG_SPL_BUILD
/* Use common default */
#ifndef CONFIG_SPL_BUILD
/* Use common default */
-#define MTDPARTS_DEFAULT MTDPARTS_DEFAULT_V1
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \