* Re: [ptxdist] Platformconfig CPU architecture for x86_64
2013-02-07 17:36 ` Michael Olbrich
@ 2013-02-08 16:28 ` Albert Antony
2013-02-08 16:32 ` Albert Antony
2013-02-18 14:16 ` [ptxdist] [PATCH] " Albert Antony
1 sibling, 1 reply; 5+ messages in thread
From: Albert Antony @ 2013-02-08 16:28 UTC (permalink / raw)
To: ptxdist
[-- Attachment #1.1: Type: text/plain, Size: 3995 bytes --]
> I know. It's on my todo list, but I've not found the time to implement this
> yet.
> Send patches :-)
>
> Michael
>
The following patch works for me. Have only patched files for the packages
I am using. Comments and suggestions appreciated :)
Cheers,
Albert.
Index: ptxdist-2013.01.0/platforms/architecture.in
===================================================================
--- ptxdist-2013.01.0.orig/platforms/architecture.in 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/platforms/architecture.in 2013-02-08
11:03:57.877905582 +0100
@@ -52,6 +52,14 @@
help
This is support for the Intel x86 architecture.
+ config ARCH_X86_64
+ bool "x86_64 "
+ select HAS_MMU
+ select HAS_PCI
+ select ARCH_SUPPORTS_ENDIAN_LITTLE
+ help
+ This is support for the Intel x86_64 architecture.
+
config ARCH_MINGW
bool "mingw "
select HAS_MMU
@@ -241,6 +249,7 @@
prompt "hardware floating point"
default y if ARCH_ALPHA
default y if ARCH_X86
+ default y if ARCH_X86_64
default y if ARCH_SPARC
default n
@@ -263,7 +272,7 @@
config SIZEOF_LONG_DOUBLE
string
default "12" if ARCH_X86
-# default "16" if ARCH_X86_64
+ default "16" if ARCH_X86_64
default "8"
# FIXME: add more values
@@ -278,6 +287,7 @@
default "alpha" if ARCH_ALPHA
default "blackfin" if ARCH_BLACKFIN
default "i386" if ARCH_X86
+ default "x86_64" if ARCH_X86_64
default "i386" if ARCH_MINGW
default "m68k" if ARCH_M68K
default "ppc" if ARCH_PPC
Index: ptxdist-2013.01.0/rules/openssl.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/openssl.make 2013-01-08 10:40:10.000000000
+0100
+++ ptxdist-2013.01.0/rules/openssl.make 2013-02-08 11:11:51.237919688 +0100
@@ -40,6 +40,7 @@
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I686) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P2) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P3M) += debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_X86_64) += debian-amd64
OPENSSL_ARCH-$(PTXCONF_ARCH_M68K) += debian-m68k
OPENSSL_ARCH-$(PTXCONF_ARCH_PPC) += debian-powerpc
OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC) += debian-sparc
Index: ptxdist-2013.01.0/rules/pre/kernel.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/pre/kernel.make 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/rules/pre/kernel.make 2013-02-08 11:15:16.465925804
+0100
@@ -28,6 +28,9 @@
ifdef PTXCONF_ARCH_X86
GENERIC_KERNEL_ARCH := "x86"
endif
+ifdef PTXCONF_ARCH_X86_64
+GENERIC_KERNEL_ARCH := "x86_64"
+endif
ifdef PTXCONF_ARCH_PPC
GENERIC_KERNEL_ARCH := "powerpc"
endif
Index: ptxdist-2013.01.0/rules/lm_sensors.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/lm_sensors.make 2013-02-08
11:30:13.601952539 +0100
+++ ptxdist-2013.01.0/rules/lm_sensors.make 2013-02-08 11:51:37.461990796
+0100
@@ -69,7 +69,7 @@
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/pwmconfig)
endif
-ifdef PTXCONF_ARCH_X86
+ifneq ($(call ifdef_any_of,PTXCONF_ARCH_X86 PTXCONF_ARCH_X86_64),)
ifdef PTXCONF_LM_SENSORS_ISASET
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/isaset)
endif
Index: ptxdist-2013.01.0/platforms/kernel.in
===================================================================
--- ptxdist-2013.01.0.orig/platforms/kernel.in 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/platforms/kernel.in 2013-02-08 13:55:40.722212603
+0100
@@ -41,9 +41,10 @@
choice
prompt "kernel architecture "
- depends on ARCH_PPC || ARCH_X86
+ depends on ARCH_PPC || ARCH_X86 || ARCH_X86_64
default KERNEL_ARCH_POWERPC if ARCH_PPC
default KERNEL_ARCH_X86 if ARCH_X86
+ default KERNEL_ARCH_X86_64 if ARCH_X86_64
help
For x86 and PowerPC there are different possibilities to set the kernel
architecture:
@@ -74,7 +75,7 @@
config KERNEL_ARCH_X86_64
bool
- depends on ARCH_X86
+ depends on ARCH_X86_64
prompt "x86_64 "
endchoice
[-- Attachment #1.2: Type: text/html, Size: 10286 bytes --]
[-- Attachment #2: Type: text/plain, Size: 48 bytes --]
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] Platformconfig CPU architecture for x86_64
2013-02-08 16:28 ` Albert Antony
@ 2013-02-08 16:32 ` Albert Antony
0 siblings, 0 replies; 5+ messages in thread
From: Albert Antony @ 2013-02-08 16:32 UTC (permalink / raw)
To: ptxdist
Ah! GMail formatting messed up the previous patch. Here it is again...
in plain text :)
Albert.
Index: ptxdist-2013.01.0/platforms/architecture.in
===================================================================
--- ptxdist-2013.01.0.orig/platforms/architecture.in 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/platforms/architecture.in 2013-02-08
11:03:57.877905582 +0100
@@ -52,6 +52,14 @@
help
This is support for the Intel x86 architecture.
+ config ARCH_X86_64
+ bool "x86_64 "
+ select HAS_MMU
+ select HAS_PCI
+ select ARCH_SUPPORTS_ENDIAN_LITTLE
+ help
+ This is support for the Intel x86_64 architecture.
+
config ARCH_MINGW
bool "mingw "
select HAS_MMU
@@ -241,6 +249,7 @@
prompt "hardware floating point"
default y if ARCH_ALPHA
default y if ARCH_X86
+ default y if ARCH_X86_64
default y if ARCH_SPARC
default n
@@ -263,7 +272,7 @@
config SIZEOF_LONG_DOUBLE
string
default "12" if ARCH_X86
-# default "16" if ARCH_X86_64
+ default "16" if ARCH_X86_64
default "8"
# FIXME: add more values
@@ -278,6 +287,7 @@
default "alpha" if ARCH_ALPHA
default "blackfin" if ARCH_BLACKFIN
default "i386" if ARCH_X86
+ default "x86_64" if ARCH_X86_64
default "i386" if ARCH_MINGW
default "m68k" if ARCH_M68K
default "ppc" if ARCH_PPC
Index: ptxdist-2013.01.0/rules/openssl.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/openssl.make 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/rules/openssl.make 2013-02-08 11:11:51.237919688 +0100
@@ -40,6 +40,7 @@
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I686) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P2) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P3M) += debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_X86_64) += debian-amd64
OPENSSL_ARCH-$(PTXCONF_ARCH_M68K) += debian-m68k
OPENSSL_ARCH-$(PTXCONF_ARCH_PPC) += debian-powerpc
OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC) += debian-sparc
Index: ptxdist-2013.01.0/rules/pre/kernel.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/pre/kernel.make 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/rules/pre/kernel.make 2013-02-08 11:15:16.465925804 +0100
@@ -28,6 +28,9 @@
ifdef PTXCONF_ARCH_X86
GENERIC_KERNEL_ARCH := "x86"
endif
+ifdef PTXCONF_ARCH_X86_64
+GENERIC_KERNEL_ARCH := "x86_64"
+endif
ifdef PTXCONF_ARCH_PPC
GENERIC_KERNEL_ARCH := "powerpc"
endif
Index: ptxdist-2013.01.0/rules/lm_sensors.make
===================================================================
--- ptxdist-2013.01.0.orig/rules/lm_sensors.make 2013-02-08
11:30:13.601952539 +0100
+++ ptxdist-2013.01.0/rules/lm_sensors.make 2013-02-08 11:51:37.461990796 +0100
@@ -69,7 +69,7 @@
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/pwmconfig)
endif
-ifdef PTXCONF_ARCH_X86
+ifneq ($(call ifdef_any_of,PTXCONF_ARCH_X86 PTXCONF_ARCH_X86_64),)
ifdef PTXCONF_LM_SENSORS_ISASET
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/isaset)
endif
Index: ptxdist-2013.01.0/platforms/kernel.in
===================================================================
--- ptxdist-2013.01.0.orig/platforms/kernel.in 2013-01-08
10:40:10.000000000 +0100
+++ ptxdist-2013.01.0/platforms/kernel.in 2013-02-08 13:55:40.722212603 +0100
@@ -41,9 +41,10 @@
choice
prompt "kernel architecture "
- depends on ARCH_PPC || ARCH_X86
+ depends on ARCH_PPC || ARCH_X86 || ARCH_X86_64
default KERNEL_ARCH_POWERPC if ARCH_PPC
default KERNEL_ARCH_X86 if ARCH_X86
+ default KERNEL_ARCH_X86_64 if ARCH_X86_64
help
For x86 and PowerPC there are different possibilities to set the kernel
architecture:
@@ -74,7 +75,7 @@
config KERNEL_ARCH_X86_64
bool
- depends on ARCH_X86
+ depends on ARCH_X86_64
prompt "x86_64 "
endchoice
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH] Platformconfig CPU architecture for x86_64
2013-02-07 17:36 ` Michael Olbrich
2013-02-08 16:28 ` Albert Antony
@ 2013-02-18 14:16 ` Albert Antony
1 sibling, 0 replies; 5+ messages in thread
From: Albert Antony @ 2013-02-18 14:16 UTC (permalink / raw)
To: ptxdist
> I know. It's on my todo list, but I've not found the time to implement
> this
> yet.
> Send patches :-)
>
> Michael
>
Here is an updated ptxdist-2013.01.0 patch for x86_64 support:
Index: b/platforms/architecture.in
===================================================================
--- a/platforms/architecture.in 2013-01-08 10:40:10.000000000 +0100
+++ b/platforms/architecture.in 2013-02-18 13:44:30.924613081 +0100
@@ -52,6 +52,14 @@
help
This is support for the Intel x86 architecture.
+ config ARCH_X86_64
+ bool "x86_64 "
+ select HAS_MMU
+ select HAS_PCI
+ select ARCH_SUPPORTS_ENDIAN_LITTLE
+ help
+ This is support for the Intel x86_64 architecture.
+
config ARCH_MINGW
bool "mingw "
select HAS_MMU
@@ -241,6 +249,7 @@
prompt "hardware floating point"
default y if ARCH_ALPHA
default y if ARCH_X86
+ default y if ARCH_X86_64
default y if ARCH_SPARC
default n
@@ -263,7 +272,7 @@
config SIZEOF_LONG_DOUBLE
string
default "12" if ARCH_X86
-# default "16" if ARCH_X86_64
+ default "16" if ARCH_X86_64
default "8"
# FIXME: add more values
@@ -278,6 +287,7 @@
default "alpha" if ARCH_ALPHA
default "blackfin" if ARCH_BLACKFIN
default "i386" if ARCH_X86
+ default "x86_64" if ARCH_X86_64
default "i386" if ARCH_MINGW
default "m68k" if ARCH_M68K
default "ppc" if ARCH_PPC
Index: b/platforms/kernel.in
===================================================================
--- a/platforms/kernel.in 2013-01-08 10:40:10.000000000 +0100
+++ b/platforms/kernel.in 2013-02-18 13:44:30.924613081 +0100
@@ -41,9 +41,10 @@
choice
prompt "kernel architecture "
- depends on ARCH_PPC || ARCH_X86
+ depends on ARCH_PPC || ARCH_X86 || ARCH_X86_64
default KERNEL_ARCH_POWERPC if ARCH_PPC
default KERNEL_ARCH_X86 if ARCH_X86
+ default KERNEL_ARCH_X86_64 if ARCH_X86_64
help
For x86 and PowerPC there are different possibilities to set the kernel
architecture:
@@ -74,7 +75,7 @@
config KERNEL_ARCH_X86_64
bool
- depends on ARCH_X86
+ depends on ARCH_X86_64
prompt "x86_64 "
endchoice
Index: b/rules/kernel.make
===================================================================
--- a/rules/kernel.make 2013-01-08 10:40:10.000000000 +0100
+++ b/rules/kernel.make 2013-02-18 13:44:55.776613823 +0100
@@ -83,6 +83,8 @@
KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_DIR)/vmlinux
# avr32 is also special
KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_AVR32) :=
$(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/images/$(KERNEL_IMAGE)
+# x86_64 is also special
+KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_X86_64) :=
$(KERNEL_DIR)/arch/x86/boot/$(KERNEL_IMAGE)
ifndef PTXCONF_PROJECT_USE_PRODUCTION
Index: b/rules/lm_sensors.make
===================================================================
--- a/rules/lm_sensors.make 2013-01-08 10:40:10.000000000 +0100
+++ b/rules/lm_sensors.make 2013-02-18 13:44:30.924613081 +0100
@@ -69,7 +69,7 @@
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/pwmconfig)
endif
-ifdef PTXCONF_ARCH_X86
+ifneq ($(call ifdef_any_of,PTXCONF_ARCH_X86 PTXCONF_ARCH_X86_64),)
ifdef PTXCONF_LM_SENSORS_ISASET
@$(call install_copy, lm_sensors, 0, 0, 0755, -, /usr/sbin/isaset)
endif
Index: b/rules/openssl.make
===================================================================
--- a/rules/openssl.make 2013-01-08 10:40:10.000000000 +0100
+++ b/rules/openssl.make 2013-02-18 13:44:30.924613081 +0100
@@ -40,6 +40,7 @@
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_I686) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P2) += debian-i386-i686/cmov
OPENSSL_ARCH-$(PTXCONF_ARCH_X86_P3M) += debian-i386-i686/cmov
+OPENSSL_ARCH-$(PTXCONF_ARCH_X86_64) += debian-amd64
OPENSSL_ARCH-$(PTXCONF_ARCH_M68K) += debian-m68k
OPENSSL_ARCH-$(PTXCONF_ARCH_PPC) += debian-powerpc
OPENSSL_ARCH-$(PTXCONF_ARCH_SPARC) += debian-sparc
Index: b/rules/pre/kernel.make
===================================================================
--- a/rules/pre/kernel.make 2013-01-08 10:40:10.000000000 +0100
+++ b/rules/pre/kernel.make 2013-02-18 13:44:30.924613081 +0100
@@ -28,6 +28,9 @@
ifdef PTXCONF_ARCH_X86
GENERIC_KERNEL_ARCH := "x86"
endif
+ifdef PTXCONF_ARCH_X86_64
+GENERIC_KERNEL_ARCH := "x86_64"
+endif
ifdef PTXCONF_ARCH_PPC
GENERIC_KERNEL_ARCH := "powerpc"
endif
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread