* platforms/u-boot-v2.in, platforms/kernel.in, platforms/console.in, platforms/architecture.in, platforms/images.in:

	cleaned up platform stuff



git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7936 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 32 insertions, 13 deletions

diff --git a/platforms/architecture.in b/platforms/architecture.in
index 00bbd8eee..37287daa0 100644
--- a/platforms/architecture.in
+++ b/platforms/architecture.in
@@ -288,12 +288,12 @@ menu "paths & directories           "
 config SYSROOT_TARGET
 	prompt "sysroot for target"
 	string
-	default "${PTXDIST_WORKSPACE}/${PTXDIST_PLATFORM_PREFIX}${PTXCONF_PLATFORM}/sysroot-target"
+	default "${PTXDIST_PLATFORMDIR}/sysroot-target"
 	help
 	  The SYSROOT_TARGET directory is the SYSROOT for all files being
 	  installed for the 'target' system. A sane default for this is
 
-	  ${PTXDIST_WORKSPACE}/${PTXDIST_PLATFORM_PREFIX}${PTXCONF_PLATFORM}/sysroot-target.
+	  ${PTXDIST_PLATFORMDIR}/sysroot-target.
 
 	  Use this one unless you do exactly know what you are doing.
 
@@ -304,11 +304,11 @@ config SYSROOT_TARGET
 
 config SYSROOT_HOST
 	string
-	default "${PTXDIST_WORKSPACE}/${PTXDIST_PLATFORM_PREFIX}${PTXCONF_PLATFORM}/sysroot-host"
+	default "${PTXDIST_PLATFORMDIR}/sysroot-host"
 
 config SYSROOT_CROSS
 	string
-	default "${PTXDIST_WORKSPACE}/${PTXDIST_PLATFORM_PREFIX}${PTXCONF_PLATFORM}/sysroot-cross"
+	default "${PTXDIST_PLATFORMDIR}/sysroot-cross"
 
 endmenu
 
diff --git a/platforms/console.in b/platforms/console.in
index c3bce0458..c9a89e178 100644
--- a/platforms/console.in
+++ b/platforms/console.in
@@ -3,12 +3,14 @@ menu "console options               "
 config CONSOLE_NAME
 	string
 	prompt "console name"
+	default "ttyS0"
 	help
 	  Name of the system console, e.g. tty0 or ttyS0
 
 config CONSOLE_SPEED
 	string
 	prompt "console speed"
+	default "115200"
 	help
 	  Speed of the system console; for consoles that don't
 	  have a speed, please enter an arbitrary value.
diff --git a/platforms/images.in b/platforms/images.in
index 2b929ca85..cbb2a6fc1 100644
--- a/platforms/images.in
+++ b/platforms/images.in
@@ -7,7 +7,8 @@ config IMAGE_TGZ
 	  Build a tar.gz archive of the root filesystem, containing the
 	  right owner/group and access permissions.
 
-config IMAGE_HD
+
+menuconfig IMAGE_HD
 	bool
 	select IMAGE_EXT2
 	select HOST_GENPART
@@ -70,6 +71,7 @@ config IMAGE_HD_PART1_END
 config IMAGE_HD_PART1_TYPE
 	string
 	default "0x83"
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART1
 	prompt "partition 1 type"
 	help
@@ -82,6 +84,7 @@ config IMAGE_HD_PART2
 
 config IMAGE_HD_PART2_START
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART2
 	prompt "partition 2 start sector"
 	help
@@ -89,6 +92,7 @@ config IMAGE_HD_PART2_START
 
 config IMAGE_HD_PART2_END
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART2
 	prompt "partition 2 end sector"
 	help
@@ -97,6 +101,7 @@ config IMAGE_HD_PART2_END
 config IMAGE_HD_PART2_TYPE
 	string
 	default "0x83"
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART2
 	prompt "partition 2 type"
 	help
@@ -104,11 +109,13 @@ config IMAGE_HD_PART2_TYPE
 
 config IMAGE_HD_PART3
 	bool
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART2
 	prompt "Create partition 3"
 
 config IMAGE_HD_PART3_START
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART3
 	prompt "partition 3 start sector"
 	help
@@ -116,6 +123,7 @@ config IMAGE_HD_PART3_START
 
 config IMAGE_HD_PART3_END
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART3
 	prompt "partition 3 end sector"
 	help
@@ -124,6 +132,7 @@ config IMAGE_HD_PART3_END
 config IMAGE_HD_PART3_TYPE
 	string
 	default "0x83"
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART3
 	prompt "partition 3 type"
 	help
@@ -131,11 +140,13 @@ config IMAGE_HD_PART3_TYPE
 
 config IMAGE_HD_PART4
 	bool
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART3
 	prompt "Create partition 4"
 
 config IMAGE_HD_PART4_START
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART4
 	prompt "partition 4 start sector"
 	help
@@ -143,6 +154,7 @@ config IMAGE_HD_PART4_START
 
 config IMAGE_HD_PART4_END
 	string
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART4
 	prompt "partition 4 end sector"
 	help
@@ -151,11 +163,13 @@ config IMAGE_HD_PART4_END
 config IMAGE_HD_PART4_TYPE
 	string
 	default "0x83"
+	depends on IMAGE_HD
 	depends on IMAGE_HD_PART4
 	prompt "partition 4 type"
 	help
 	  see Generate images/hd.img
 
+
 config IMAGE_IPKG_IMAGE_FROM_REPOSITORY
 	bool
 	prompt "make images: use packets from repository"
@@ -173,7 +187,8 @@ config IMAGE_IPKG_EXTRA_ARGS
 	  If needed you can add extra arguments for ipkg-build here
 	  (e.g. -c if you want ipkg-build to use tar instead of ar.)
 
-config IMAGE_JFFS2
+
+menuconfig IMAGE_JFFS2
 	bool
 	select HOST_MTD_UTILS
 	prompt "Generate images/root.jffs2"
@@ -204,7 +219,8 @@ config IMAGE_JFFS2_EXTRA_ARGS
 	  (e.g. --devtable=${PTXDIST_WORKSPACE}/device_table.txt or
 	  -b to create a big endian filesystem on a little endian host)
 
-config IMAGE_UIMAGE
+
+menuconfig IMAGE_UIMAGE
 	bool
 	prompt "Generate images/uRamdisk"
 	select HOST_UMKIMAGE
@@ -230,6 +246,7 @@ config IMAGE_UIMAGE_EXTRA_ARGS
 	  If needed you can add extra arguments for umkimage here
 	  (e.g. -a 0xaa00000 -e 0xaa00000 )
 
+
 config IMAGE_CPIO
 	bool
 	prompt "Generate images/initrd.gz"
@@ -249,7 +266,7 @@ config IMAGE_CPIO
 #	  the bootloader U-Boot. It contains the kernel and the
 #	  RAM disk in one image.
 
-config IMAGE_EXT2
+menuconfig IMAGE_EXT2
 	bool
 	select HOST_GENEXT2FS
 	prompt "Generate images/root.ext2"
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 127734fae..5aab19ac7 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -30,6 +30,7 @@ config KERNEL_VERSION
 	depends on KERNEL
 	prompt "kernel version"
 	string
+	default "2.6.25"
 
 choice
 	prompt "kernel architecture "
@@ -112,15 +113,13 @@ config KERNEL_CONFIG
 	depends on KERNEL
 	prompt "kernel config file"
 	string
-	default "kernelconfig.target"
+	default "${PTXDIST_PLATFORMCONFIGDIR}/kernel.config"
 	help
 	  this entry specifies the .config file used to compile your kernel
 
 endmenu
 
 
-# FIXME make this architecture dependend
-
 choice
 	depends on KERNEL
 	prompt "Image Type          "
@@ -153,7 +152,7 @@ choice
 		bool
 		prompt "vmImage"
 		help
-		 This is the target for most non ia32 platforms like blackfin
+		 This is the target for non ia32 platforms like blackfin
 		 architectures.
 
 	config KERNEL_IMAGE_VMLINUX
diff --git a/platforms/u-boot-v2.in b/platforms/u-boot-v2.in
index 70aae243c..995b07160 100644
--- a/platforms/u-boot-v2.in
+++ b/platforms/u-boot-v2.in
@@ -6,12 +6,13 @@ config U_BOOT_V2_VERSION
 	prompt "u-boot-v2 version"
 	depends on U_BOOT_V2
 	string
+	default "2.0.0"
 
 config U_BOOT_V2_CONFIG
 	prompt "config file"
 	depends on U_BOOT_V2
 	string
-	default "u-boot-v2.config"
+	default "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-v2.config"
 	help
 	  this entry specifies the .config file used to compile your U-Boot