Merge branch 'master' into stellaris

target/init.c

@@ -25,7 +25,7 @@
 #include <target.h>
 #include <compiler.h>
 
-/* 
+/*
  * default implementations of these routines, if the target code
  * chooses not to implement.
  */

target/realview-pb/rules.mk

@@ -0,0 +1,15 @@
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+#MODULE := $(LOCAL_DIR)
+
+INCLUDES += \
+	-I$(LOCAL_DIR)/include
+
+PLATFORM := realview-pb
+
+MODULES += \
+
+DEFINES += \
+
+#include make/module.mk
+

target/sam7ex256/README

@@ -1,6 +0,0 @@
-Olimex SAM7-EX256 Board
-http://olimex.com/dev/sam7-ex256.html
-http://olimex.com/dev/images/sam7-ex256-sch.gif
-
-This platform is a specialization of the generic platform/at91sam7
-

target/sam7ex256/include/platform/mux.def

@@ -1,9 +0,0 @@
-# debug uart
-#
-PA27 DRXD
-PA28 DTXD
-
-# CAN 
-#
-PA19 CANRX
-PA20 CANTX

target/sam7ex256/include/platform/mux.h

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2008 Travis Geiselbrecht
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/* DO NOT EDIT -- AUTOGENERATED FROM 'include/platform/mux.def' */
-
-#ifndef __BOARD_DEFINITION_FILE__
-#define __BOARD_DEFINITION_FILE__
-
-#define PIN_DRXD         (1 << 27)
-#define PIN_DTXD         (1 << 28)
-#define PIN_CANRX        (1 << 19)
-#define PIN_CANTX        (1 << 20)
-
-#define BOARD_OUTPUT_DISABLE 0xffffffff
-#define BOARD_OUTPUT_ENABLE  0x00000000
-#define BOARD_PULLUP_DISABLE 0x18180000
-#define BOARD_PULLUP_ENABLE  0xe7e7ffff
-#define BOARD_PIO_DISABLE    0x18180000
-#define BOARD_PIO_ENABLE     0xe7e7ffff
-#define BOARD_SELECT_A       0x18180000
-#define BOARD_SELECT_B       0x00000000
-
-#endif

target/sam7ex256/mkmux.sh

@@ -1 +0,0 @@
-../../platform/at91sam7/mkboard.py ../../platform/at91sam7/at91sam7x.pins include/platform/mux.def

target/sam7ex256/rules.mk

@@ -1,10 +0,0 @@
-LOCAL_DIR := $(GET_LOCAL_DIR)
-
-AT91CHIP := sam7x256
-
-PLATFORM := at91sam7
-
-INCLUDES += -I$(LOCAL_DIR)/include
-
-#OBJS += 
-

target/stm32-p407/init.c

@@ -37,7 +37,7 @@ void target_early_init(void)
 	/* configure the usart3 pins */
 	gpio_config(GPIO_USART3_TX, GPIO_STM32_AF | GPIO_STM32_AFn(GPIO_AF_USART3) | GPIO_PULLUP);
 	gpio_config(GPIO_USART3_RX, GPIO_STM32_AF | GPIO_STM32_AFn(GPIO_AF_USART3) | GPIO_PULLUP);
-	
+
 	stm32_debug_early_init();
 
 	/* configure some status leds */