bsp directory created depending on profile

3 files changed, 82 insertions, 6 deletions

diff --git a/target/linux/realtek/files/arch/rlx/Makefile b/target/linux/realtek/files/arch/rlx/Makefile
index c09a8fea8..2457eb399 100644
--- a/target/linux/realtek/files/arch/rlx/Makefile
+++ b/target/linux/realtek/files/arch/rlx/Makefile
@@ -32,6 +32,8 @@ vmlinux-32		= vmlinux
 cflags-y := -ffunction-sections
 cflags-y += $(call cc-option, -mno-check-zero-division)
 cflags-y += -mabi=32
+cflags-$(CONFIG_ARCH_CPU_RLX4181) += -march=rlx4181
+cflags-$(CONFIG_ARCH_CPU_RLX5281) += -march=rlx5281
 
 #
 # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
@@ -41,7 +43,7 @@ cflags-y += -mabi=32
 #
 cflags-y			+= -G 0 -mno-abicalls -fno-pic -pipe
 cflags-y			+= -msoft-float
-LDFLAGS_vmlinux     += -G 0 -static -n -nostdlib
+LDFLAGS_vmlinux			+= -G 0 -static -n -nostdlib
 MODFLAGS			+= -mlong-calls
 
 cflags-y += -ffreestanding
@@ -67,7 +69,27 @@ cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -EL $(undef-all) $(predef-le)
 #
 # BSP Makefile
 #
-include arch/rlx/bsp/Makefile
+
+include $(TOPDIR)/.config
+
+include arch/rlx/Makefile.bsp
+#include arch/rlx/bsp/Makefile
+
+
+core-y   += arch/rlx/bsp/
+cflags-y += -Iinclude/asm-rlx -Iarch/rlx/bsp/ -Iarch/rlx
+load-y   += 0x80000000
+
+
+obj-y := prom.o setup.o irq.o timer.o serial.o dev_usb.o
+obj-$(CONFIG_PCI) += pci.o
+
+EXTRA_AFLAGS := $(CFLAGS)
+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/rtl819x/AsicDriver
+EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/rtl819x/common
+ifdef CONFIG_RTL_819X_SWCORE
+EXTRA_CFLAGS += -DCONFIG_RTL_819X_SWCORE
+endif
 
 cflags-y                    += -I$(srctree)/arch/rlx/include/asm/mach-generic
 drivers-$(CONFIG_PCI)       += arch/rlx/pci/
@@ -121,12 +143,13 @@ drivers-$(CONFIG_OPROFILE)	+= arch/rlx/oprofile/
 #
 # Targets
 #
+
 vmlinux.32: vmlinux
 	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@
 
 makeboot =$(Q)$(MAKE) $(build)=arch/rlx/boot VMLINUX=$(vmlinux-32) $(1)
 
-all: vmlinux.32
+all: bsp vmlinux.32
 
 vmlinux.bin: $(vmlinux-32)
 	+@$(call makeboot,$@)
diff --git a/target/linux/realtek/files/arch/rlx/Makefile.bsp b/target/linux/realtek/files/arch/rlx/Makefile.bsp
new file mode 100644
index 000000000..1629eb5f9
--- /dev/null
+++ b/target/linux/realtek/files/arch/rlx/Makefile.bsp
@@ -0,0 +1,25 @@
+CURRENT_BSP:=bsp
+ifdef CONFIG_RTL_8196C
+CURRENT_BSP:=rtl8196c
+else
+ifdef CONFIG_RTL_8196E
+CURRENT_BSP:=rtl8196e
+else
+ifdef CONFIG_RTL_8196EU
+CURRENT_BSP:=rtl8196eu
+else
+ifdef CONFIG_RTL_8198
+CURRENT_BSP:=rtl8198
+else
+ifdef CONFIG_RTL_819XD
+CURRENT_BSP:=rtl819xD
+endif
+endif
+endif
+endif
+endif
+
+bsp:
+
+	rm -rf arch/rlx/bsp
+	ln -s ./bsp_$(CURRENT_BSP) arch/rlx/bsp
diff --git a/target/linux/realtek/files/arch/rlx/config.in b/target/linux/realtek/files/arch/rlx/config.in
index 8f31e0e08..f4c020165 100644
--- a/target/linux/realtek/files/arch/rlx/config.in
+++ b/target/linux/realtek/files/arch/rlx/config.in
@@ -16,6 +16,11 @@ config RTL_8196C
 	select ARCH_REQUIRE_GPIOLIB
 	select ARCH_CPU_RLX4181
 
+config RTL_8196E
+	bool "rtl8196e"
+	select ARCH_REQUIRE_GPIOLIB
+	select ARCH_CPU_RLX4181
+
 endchoice
 endmenu
 
@@ -99,6 +104,9 @@ menu "System Configuration"
 choice
 	prompt "System Type"
 	default RTL_81XXX
+	default RTL_8196D_GW if RTL_819XD
+	default RTL_8196C_GW if RTL_8196C
+	default RTL_8196E_GW if RTL_8196E
 
 config RTL_81XXX
 	bool "Selects default platform/This one is empty"
@@ -158,7 +166,14 @@ config RTL_8196C_iNIC
 config RTL_8196C_ICT
 	bool "RTL8196C IC Test"
 	depends on RTL_8196C
-	#select FPGA_PLATFORM
+
+config RTL_8196E_GW
+        bool "96E GW"
+        depends on RTL_8196E
+	select SYS_HAS_EARLY_PRINTK
+        help
+          This enables support for Realtek RTL8196E demo board
+
 
 endchoice
 endmenu
@@ -187,7 +202,19 @@ config RTL_8197DL
 
 config RTL_819XD_GW
 	bool
-	
+
+config RTL_8196E_GW
+	bool
+
+config RTL_NFJROM_MP
+	bool "build nfjrom image for MP"
+	default n
+	depends on RTL_8196E
+
+config RTL_SDRAM_GE_32M
+        bool "sdram size greater than or equal 32M"
+        default y if RTL_8196E_GW
+
 config RTL_PCIE_SIMPLE_INIT
 	bool
 	default y if RTL8192SE
@@ -211,8 +238,9 @@ config RTL819X_SPI_FLASH
 	bool "SPI flash support"
 
 config AUTO_PCIE_PHY_SCAN
-	bool "8196D PCIE Autoscan PCIE PHY 40Mhz"
+	bool "8196D/E PCIE Autoscan PCIE PHY 40Mhz"
 	depends on RTL_8196D
+	depends on RTL_8196E
 	default y
 
 config PHY_EAT_40MHZ